DO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3 am: dee8c...
Jeff Sharkey [Thu, 18 Feb 2016 22:36:44 +0000 (22:36 +0000)]
am: 38e585c615  -s ours

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


Trivial merge