| commit | 21b2f6f9eafc2e316e0a7e8b6fab141fe2a23134 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Feb 25 17:27:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 25 17:27:04 2016 +0000 |
| tree | 652abc5e38c01c86ac3c4dc938c3b1fe36ade073 | |
| parent | 39ed49b6937bbad14c49571842164c600ccf6e00 [diff] | |
| parent | c90e21f28683a9256bfda7824bd4cf263a082f58 [diff] |
resolve merge conflicts of 078d4de90b to ub-launcher3-calgary am: c90e21f286 * commit 'c90e21f28683a9256bfda7824bd4cf263a082f58': Defining the base state of the Launcher theme, in case the platform has different defaults