tree 32c4939110e09844773e6e97b71470ec8823521d
parent eb83d9c0cc7933737950f96e187936e430d43079
parent ede09428f689e76a37295feed9420309991df196
author Kenny Guy <kennyguy@google.com> 1502197449 +0000
committer android-build-merger <android-build-merger@google.com> 1502197449 +0000

Merge "Update colour to match toasts." into oc-dr1-dev am: 91866c65a5
am: ede09428f6  -s ours

Change-Id: If05e756f102dc74cc3f46a03eed0fc53f954f15c