diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-03-24 02:58:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 02:58:56 +0000 |
| commit | 568e39187231d1e5bac620b3369087587be61db8 (patch) | |
| tree | 34bcaad3fc7b33e1ce25dda310fab432aefcb2f5 /rs/java/android/renderscript/RenderScript.java | |
| parent | 90214cd7f5acfb684b0b601816d885549080cac7 (diff) | |
| parent | c8bb597fba16589b9d76959bae22da22d00967d4 (diff) | |
am c8bb597f: (-s ours) am 09ebc52a: am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
* commit 'c8bb597fba16589b9d76959bae22da22d00967d4':
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions