Merge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5...
Jeff Sharkey [Sat, 23 Jan 2016 01:04:18 +0000 (01:04 +0000)]
am: 15185cff91

* commit '15185cff911670eba8f742fe8a2f26de5ed657fe':
  Revert "Use resolved path for both checking and opening."


Trivial merge