diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-05-06 21:26:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 21:26:56 +0000 |
| commit | 06528424003649999686f0048097574fca3d36e5 (patch) | |
| tree | e88c9354a67e24746b68b81985085948d4a8d492 /rs/java/android/renderscript/RenderScript.java | |
| parent | 9bd01ef0c6ba09ca626f49bd162ce9aede41b027 (diff) | |
| parent | 1a556b996156b71bdbb60f6f9cd7bd3e16947a4f (diff) | |
am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev
* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
DO NOT MERGE Hide banner manifest attribute.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions