DO NOT MERGE. Use resolved path when inserting and deleting.
authorJeff Sharkey <jsharkey@android.com>
Thu, 18 Feb 2016 19:36:41 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 19:36:41 +0000 (19:36 +0000)
commitdee8c810c8edbb90e43db69a4ed1b7d2ee375d07
tree60177ae15d137d7bfe46adfda9ab41ffbf661fa8
parentfdf77d88dca6e6ffa84b0c46dcc512d968fd5f0f
parent600d3afcc3cbe2a9c3f44eda66bec806709c20e8
DO NOT MERGE. Use resolved path when inserting and deleting.
am: 600d3afcc3

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