DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:42:14 +0000 (01:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:42:14 +0000 (01:42 +0000)
commit47784d61cf756509e5002b0938af03ce009fd854
treeae8fe48bbc79c0a044dc0624f6f30d09b11bc0f4
parent5a066c39a6149d155ba7b4a6aada49bf6bfe240a
parent1aaf16b00e0bb62547686a742023648d2558f557
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb
am: 1aaf16b00e  -s ours

* commit '1aaf16b00e0bb62547686a742023648d2558f557':
  DO NOT MERGE. Use resolved path for both checking and opening.