diff options
author | Robert Ly <robertly@google.com> | 2014-08-13 16:22:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-13 16:22:05 +0000 |
commit | aa38054c190a0d7fa0cca147eaefc1ad9826d504 (patch) | |
tree | eb942bdc321239bc68d94e5e6eec582289870e7a /rs/java/android/renderscript/RenderScript.java | |
parent | 9dfce1e64863b8665ed12ff432cf35fe02aa10e2 (diff) | |
parent | b369ff7b389e1032b0200c2b5564e85532e05a16 (diff) |
am 683306d4: am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
* commit '683306d449a42a26300a3a09c5bbe83518b34c05':
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions