tree 863c75a9a702349640f6a6f9938b2cd75edb738d
parent 13ebe12106bae735b143f75923728372d252b37d
parent 6d9b72795657b6e23ba9941ee9a8288d3d080afb
author Colin Cross <ccross@android.com> 1534553957 -0700
committer android-build-merger <android-build-merger@google.com> 1534553957 -0700

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

Change-Id: Id48ba61d5e7a9db537ae5415dfbecb1c5b8e585a