| commit | c1763b24fc7ea6d23087197d6091c56916a51e17 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Oct 23 12:23:15 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Fri Oct 23 12:29:44 2015 -0700 |
| tree | 214405a78a438d8990b40b4b849d49ce955786a5 | |
| parent | 92adb669da53646cc59fba3d71c6d12ffabdbb16 [diff] | |
| parent | 52040c2d51d9c4d1bfaeda8e067deb7655099840 [diff] |
resolve merge conflicts of 52040c2d51 to ub-launcher3-master. Change-Id: Ie3cf72ef11b43e2c681d6d614c668062c7e7b74c