tree 17843494c571d4fbeb5bb18e3c901798304ca961
parent a005a0a6fa4f287db80bf9ebb9b7f25728f012b5
parent f0d479d45677500e24ba747bc64f071cffbbd2ab
author Android Build Merger (Role) <android-build-merger@google.com> 1501278372 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501278372 +0000

Merge "Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev am: 905fcf0787 am: c38935cc7c" into oc-mr1-dev-plus-aosp