DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
authorJeff Sharkey <jsharkey@android.com>
Thu, 18 Feb 2016 22:22:22 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 22:22:22 +0000 (22:22 +0000)
commitc3318757591bff1c92bf547c9cdb9d76a17fe107
tree46b64325238195b97cd78a6cd3c67856ce1ddc97
parent38e585c61518c5a9a08c9288ca15f97fdd9339d6
parent725e5f177d75a37e7ed5b27a99405d1b5fa479dd
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a939e0
am: 725e5f177d

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