| commit | 4e188fba45766c56efab9873f6ad79462ef83748 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 17 14:43:41 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 17 14:43:41 2015 -0700 |
| tree | 0c1c9de21e18aea4e9173277cace9f76d59cfc32 | |
| parent | 89d595dd15d0f457e0135b2251cca5e9936c851a [diff] | |
| parent | 9bd5ddca06249ff8fecdb5b0677c32c7f8a04a21 [diff] |
resolved conflicts for merge of 9fc953b9 to ub-launcher3-master Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1