| commit | e7337e0c3e3482706fd89ee71ca4aaf90ebdc598 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Dec 02 19:32:07 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Dec 02 19:32:07 2015 -0800 |
| tree | eb9d8fe5e0c557271decef50e5a49f5a182a5ad5 | |
| parent | ff6a81508fb930fed6cc6fc426904a7093bf7172 [diff] | |
| parent | aa4011e63ed3a226e2876850fd93e7eec01f8845 [diff] |
resolve merge conflicts of aa4011e63e to ub-launcher3-master. Change-Id: Id91f5c3be2678ca05cd51aa72bb6a25112afb020