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