diff options
author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 01:15:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 01:15:31 +0000 |
commit | be34916d448e9cd04bebfa5bf3d61de0c8087d65 (patch) | |
tree | efbe53709b3506ab8d0e6145cd496eb7053f34f9 /rs/java/android/renderscript/RenderScript.java | |
parent | 46c588b9394128a2da2c0ce3cea4eef05cea0f12 (diff) | |
parent | 45ef73b4e97a0621ba5f26eef280f6550c81338d (diff) |
am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit '45ef73b4e97a0621ba5f26eef280f6550c81338d':
docs: Add Android 5.1 to the uses-sdk manifest docs
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions