| commit | 09168a9f3dd29f38d82b852dced6c8b42b9c85b9 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Apr 06 19:39:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 06 19:39:57 2016 +0000 |
| tree | 9c297e58eb231f5a2b7ba0164195aaa33a343acb | |
| parent | c79e640b5c4aa1cc7a183d2bb144c0b60dd43d64 [diff] | |
| parent | 4a754f821bf1cf4434ee48a2783d79b421bda837 [diff] |
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