diff options
author | Anthony Hugh <ahugh@google.com> | 2015-03-23 20:21:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 20:21:58 +0000 |
commit | 09ebc52a851d3432087a622a9372a071a1c0c761 (patch) | |
tree | 9ea297e4e18192228f2b99e69b2fda74a8136eba /rs/java/android/renderscript/RenderScript.java | |
parent | b42baaa829be7efa692088e97a44712daecbf5f4 (diff) | |
parent | 7c08dd61c43d76241c8f47c5aae934486605a80e (diff) |
am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
* commit '7c08dd61c43d76241c8f47c5aae934486605a80e':
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