DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:49:04 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:49:04 +0000 (01:49 +0000)
commite33446d2dc4846df0fe93da49090b990e2db9267
tree50b30d7f32d9451c3faf87aea64cbffa06f6a699
parent80409f3081ae9bae81f6005e12003bde11ed42a0
parent224c8b5d4e15175c9632b25d8a4f3fecc81cc074
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 am: 47784d61cf am: ae7d56abe4
am: 224c8b5d4e  -s ours

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