diff options
| author | Bart Sears <bsears@google.com> | 2015-03-05 00:52:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-05 00:52:58 +0000 |
| commit | 5a1cec86cfb3f08fac06ed26fe81247c3415d3ca (patch) | |
| tree | 04ab9aa65095748626af8ced7e1f5861947da694 /rs/java/android/renderscript/RenderScript.java | |
| parent | 5a6b44c435fb06817a66bb74c66a5a6d19690616 (diff) | |
| parent | 0c3052a6675ed528c2898bd2ecb92576bca78df9 (diff) | |
am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '0c3052a6675ed528c2898bd2ecb92576bca78df9':
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