DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 04:47:35 +0000 (04:47 +0000)]
am: fdf77d88dc

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


Trivial merge