DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
authorJeff Sharkey <jsharkey@android.com>
Thu, 18 Feb 2016 22:36:50 +0000 (22:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 22:36:50 +0000 (22:36 +0000)
commit377b6b1eef515aa3439cbe6a65c82e7fe4a9041f
tree1867b819e1fc6afeff697981b4bfc95e41cb8ab5
parentaca04fd1132ef6019d0a87387f1d0fb261d9d14a
parentc3318757591bff1c92bf547c9cdb9d76a17fe107
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a939e0 am: 725e5f177d
am: c331875759  -s ours

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