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