| commit | 578b151c1e90dfae84ab8332e8b5db0dfda21e6c | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 18 15:04:13 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 18 15:04:13 2015 -0800 |
| tree | 7c17043fc3c7ca2db86cd6190906a67a636e53c4 | |
| parent | 87181057205f6d13704eb1f8cfa926abab5cb633 [diff] | |
| parent | b00a83fe87e82a2a084886af166b5e2945a444e7 [diff] |
resolve merge conflicts of ffa1237698 to ub-launcher3-master. Change-Id: I65beecb5bbbfe9c4b33d6ca639118cb615c4120a