DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:25:50 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:25:50 +0000 (01:25 +0000)
commit46a4c650bbb2699612dd98cd627109db3334af71
tree46755097ef07e038808a6a7bc1ece06753bc7322
parent9294cf83d93386caae1103ea9c969ff3e6e8f85d
parent8e6c8093709b144e69efb8c6bff4be50729f3c25
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6
am: 8e6c809370  -s ours

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