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