summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-02-25 15:44:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-25 15:44:24 +0000
commit0fc59cd958b87d015deac63797fcbfbcec518389 (patch)
treeb433babd666b207d4066987cfc6a86b50869365e /rs/java/android/renderscript/RenderScript.java
parent2326acb591d889d9492219f5f8f79940fd66ba70 (diff)
parentda2bbaf219117f7507c5c0015c41347a9cc27507 (diff)
am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507': UsbDeviceManager: Fix race condition entering USB accessory mode
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions