DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Jan 2016 01:45:07 +0000 (01:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 01:45:07 +0000 (01:45 +0000)
commitae7d56abe493e7896a24024d1cf0d16e55609e6e
tree918c22ecbe3b8b0da680b6c29dd6c4c60afd1065
parent78b21c54af58acd7acc40f1cd010a8cf8ed1d07b
parent47784d61cf756509e5002b0938af03ce009fd854
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

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