diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-24 23:55:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 23:55:14 +0000 |
commit | cbb4ec78675c8179cdedafba1972ac062844c70a (patch) | |
tree | 014937065ccf09450d0373f4e09de58f12c49344 /rs/java/android/renderscript/Script.java | |
parent | a16bb347e120ba17e87f33ff0364380211d01baf (diff) | |
parent | 6f5fac817abee63d9211e8e43646196950c43707 (diff) |
am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '6f5fac817abee63d9211e8e43646196950c43707':
Fix project settings. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions