tree 863c75a9a702349640f6a6f9938b2cd75edb738d
parent e6b9fec26ab112a20a79c4db1d1345ad4c19bc8c
parent 9cc362c55d7f118063042721a2df505f9be91dce
author Colin Cross <ccross@android.com> 1534551277 -0700
committer android-build-merger <android-build-merger@google.com> 1534551277 -0700

Merge "Convert frameworks/opt/colorpicker to Android.bp"
am: 9cc362c55d

Change-Id: I8a6456b6f40754dc57fe2dd1ca9d58966c8bd2d3