DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 02:00:17 +0000 (02:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 02:00:17 +0000 (02:00 +0000)
commitfdf77d88dca6e6ffa84b0c46dcc512d968fd5f0f
tree104a6254f3cd3053230d5f266fb477a6dd5cea6a
parentbd15b5ea8fb6bcc1ae56413080c5afcc9fac47fe
parent1c88cf50a5220ec6105813392be5ed34b98c7b9e
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

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