diff options
author | Brian Carlstrom <bdc@google.com> | 2014-03-05 19:29:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 19:29:40 +0000 |
commit | a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f (patch) | |
tree | 2c2dbc3982a7901fa9f8f27de9b59f2c929940a9 /rs/java/android/renderscript/RenderScript.java | |
parent | 7a4e519eda4e0e7bac9ad0159b29b11f61b50e01 (diff) | |
parent | 485e3b459491267ae1390e1df5ff8f7d4695f819 (diff) |
am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
Add dex2oat-flags plumbing to AndroidRuntime
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions