| commit | 4a754f821bf1cf4434ee48a2783d79b421bda837 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Apr 06 19:31:40 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 06 19:31:40 2016 +0000 |
| tree | 9c297e58eb231f5a2b7ba0164195aaa33a343acb | |
| parent | b0e378000fac0d4a2d5a75d887f5a6733bdab900 [diff] | |
| parent | b9f3d025d8db9da0711daa1691d3bace831b0317 [diff] |
Merge "Deleting resources added due to merge conflicts" into ub-launcher3-calgary