DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:51:20 +0000 (01:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:51:20 +0000 (01:51 +0000)
commit1c88cf50a5220ec6105813392be5ed34b98c7b9e
tree159e92bba45e191f997399c39a2aedf62f4b615a
parent6b8c97d2e434f0608f9fabf2cea6c5371860b23d
parente33446d2dc4846df0fe93da49090b990e2db9267
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

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