tree 43583519b443d237a9c8132d7335d4c2d4a9c887
parent 407fd9f828431641d05a37d6d90ac562b42c8f20
parent db83feae548386ce690e1d418f38042c3362d5f0
author Android Build Merger (Role) <android-build-merger@google.com> 1492805130 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492805137 +0000

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