DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 04:47:35 +0000 (04:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 04:47:35 +0000 (04:47 +0000)
commit8814493bfdf1dc52d8aebe848e28b7f0652af18d
treefe205687fc9d7a776d1f55b3d3e8ee823f1c0952
parente74f002e6e2f8f00595e4179ed6c3f85da21796b
parentfdf77d88dca6e6ffa84b0c46dcc512d968fd5f0f
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 am: e33446d2dc am: 1c88cf50a5
am: fdf77d88dc

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