diff options
| author | Alan Viverette <alanv@google.com> | 2015-04-30 00:02:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 00:02:23 +0000 |
| commit | d232e636f24b8bc67dde8decd006d542bafb15f8 (patch) | |
| tree | f78613ac74564cfb879c108b2a1284f6fac6baf7 /tools/aidl/generate_java.cpp | |
| parent | ad8aa59f70e2a27cf6b12a982f536d158f219ac4 (diff) | |
| parent | 0f1a3972c18371359c39e6789607621bf0989181 (diff) | |
am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit '0f1a3972c18371359c39e6789607621bf0989181':
Stash modulation alpha until ColorStateList has resolved base color
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions