| commit | 32cc8b2081b34b3275e091d8f80cc9a762b81de5 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Apr 30 00:16:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 30 00:16:27 2015 +0000 |
| tree | bfeb86bcf45997b3e5f8a1da1a564927545f8871 | |
| parent | b159b2daac9c7d9993e7ddf4c225490f8252c1cf [diff] | |
| parent | d232e636f24b8bc67dde8decd006d542bafb15f8 [diff] |
am d232e636: am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev * commit 'd232e636f24b8bc67dde8decd006d542bafb15f8': Stash modulation alpha until ColorStateList has resolved base color