tree bf9bf89b4c11a911e6ff545ea17203ea2e0f3250
parent dba6d0772a3be9a89701796f50859023acb1ca1d
parent 61edb5422b0803144533ef45f09b635b776d7b71
author Andrew Sapperstein <asapperstein@google.com> 1466451820 +0000
committer android-build-merger <android-build-merger@google.com> 1466451820 +0000

Merge \"Update Launcher to use theme colors.\" into ub-launcher3-calgary
am: 61edb5422b

Change-Id: I1d35ff85626f1c7b3bd3644b9b5f5fb582d25e6a