DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
Jeff Sharkey [Thu, 18 Feb 2016 22:36:50 +0000 (22:36 +0000)]
am: c331875759  -s ours

* commit 'c3318757591bff1c92bf547c9cdb9d76a17fe107':
  DO NOT MERGE. Use resolved path when inserting and deleting.


Trivial merge