tree 407b2bc22d9db9a6b110860d90ea21f91a937ab1
parent d5fcb3a45f96480eb241b4691fc6041b4d82d841
parent eedceb57216748bc6efe0b554c064222c035467a
author Lucas Dupin <dupin@google.com> 1492803854 +0000
committer android-build-merger <android-build-merger@google.com> 1492803854 +0000

Merge "Add transfer mode support to ColorDrawable" into oc-dev
am: eedceb5721

Change-Id: If27a7e4154dabbeffd2b11ee2b788c9e30b3d9a7