diff options
author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 01:32:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 01:32:41 +0000 |
commit | 0c53910308cb437d9b70395a492141181d943902 (patch) | |
tree | 3b022daccafd6cd301661686265025950bbf6e27 /rs/java/android/renderscript/RenderScript.java | |
parent | 882a7fd40ed5704a59f49b4d97d9600a4e30db46 (diff) | |
parent | aa1d21379020440f173b58a9edf32381a999f7bf (diff) |
am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit 'aa1d21379020440f173b58a9edf32381a999f7bf':
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