DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:38:53 +0000 (01:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:38:53 +0000 (01:38 +0000)
commit1aaf16b00e0bb62547686a742023648d2558f557
tree3283925f87481e81b5d4ee15ee6603e8a852c3a5
parente6235ebca3a939ccce6d0e93ce0902332ca7690d
parent46a4c650bbb2699612dd98cd627109db3334af71
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours
am: 46a4c650bb

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