tree 652abc5e38c01c86ac3c4dc938c3b1fe36ade073
parent 39ed49b6937bbad14c49571842164c600ccf6e00
parent c90e21f28683a9256bfda7824bd4cf263a082f58
author Sunny Goyal <sunnygoyal@google.com> 1456421224 +0000
committer android-build-merger <android-build-merger@google.com> 1456421224 +0000

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