tree 83cffd468fdb47ce84c557d143357920c20dc7b9
parent ae4b64ab41ac4432d8b7b7399bac356fea9ccd5d
parent 905fcf07878a30b79579e873ce7e4afc7168c5d9
author Evan Laird <evanlaird@google.com> 1501276948 +0000
committer android-build-merger <android-build-merger@google.com> 1501276948 +0000

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

Change-Id: I71cbb691f3bfe8d4d37fd09d5d1bc5ef83146090