diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-01 17:11:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 17:11:06 +0000 |
| commit | e5ee1dec2cb25a47b6193e752d4fc4c36022e3f0 (patch) | |
| tree | 28aae03ab6084bba9d21fe0fd7667701a9319d26 /rs/java/android/renderscript/ScriptIntrinsic.java | |
| parent | eb659ee3b4603777b38e04b593a51f6fb349a477 (diff) | |
| parent | 999a1ca984ec0877c795433e6f1baa6cd5853aac (diff) | |
am 999a1ca9: am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev
* commit '999a1ca984ec0877c795433e6f1baa6cd5853aac':
Add activated text colors, update Material preference header
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsic.java')
0 files changed, 0 insertions, 0 deletions