tree 9c297e58eb231f5a2b7ba0164195aaa33a343acb
parent c79e640b5c4aa1cc7a183d2bb144c0b60dd43d64
parent 4a754f821bf1cf4434ee48a2783d79b421bda837
author Sunny Goyal <sunnygoyal@google.com> 1459971597 +0000
committer android-build-merger <android-build-merger@google.com> 1459971597 +0000

Merge "Deleting resources added due to merge conflicts" into ub-launcher3-calgary
am: 4a754f8

* commit '4a754f821bf1cf4434ee48a2783d79b421bda837':
  Deleting resources added due to merge conflicts

Change-Id: If24fd61b906d000e2a816de594c884a733423f16