DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:47:08 +0000 (01:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:47:08 +0000 (01:47 +0000)
commit224c8b5d4e15175c9632b25d8a4f3fecc81cc074
treeeb966a1d6b1fb572ccb1baf24f78707cac0502ec
parent451e81a33193986f5de177e7a66393e8aba4134f
parentae7d56abe493e7896a24024d1cf0d16e55609e6e
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

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