diff options
| author | Craig Mautner <cmautner@google.com> | 2015-03-04 16:15:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 16:15:35 +0000 |
| commit | 83a63bac5d303c63c534c10a53d37edcea782d28 (patch) | |
| tree | 5d0aceb301f921e5ca1cedd26e51da6581b291c6 /rs/java/android/renderscript/RenderScript.java | |
| parent | 14fcef3bf02f46a057676d7a6d755daee735c4ea (diff) | |
| parent | 8fa394fa8c4eb3ca832dac36baf5645a40d449f1 (diff) | |
am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions