diff options
author | Alan Viverette <alanv@google.com> | 2014-10-01 15:02:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 15:02:49 +0000 |
commit | e5bed12bc2c1fede6b7f2db22d4432f4473c3232 (patch) | |
tree | 81571a2fab6279b6e40a0215e60fbbaeea4c09ea /rs/java/android/renderscript/ScriptGroup.java | |
parent | d292220f460400b7c9b6549a39578c87317b6daf (diff) | |
parent | c2379e005d3e692d0b725c65fa842459e65ad1dc (diff) |
am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev
* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
Add activated text colors, update Material preference header
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup.java')
0 files changed, 0 insertions, 0 deletions