DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081
authorJeff Sharkey <jsharkey@android.com>
Thu, 18 Feb 2016 19:42:41 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 19:42:41 +0000 (19:42 +0000)
commit725e5f177d75a37e7ed5b27a99405d1b5fa479dd
tree60177ae15d137d7bfe46adfda9ab41ffbf661fa8
parentdee8c810c8edbb90e43db69a4ed1b7d2ee375d07
parent0a60a939e00a386f65a48288d8d9a4c7213e2707
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081
am: 0a60a939e0

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