summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-18 19:38:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-18 19:38:36 +0000
commit400ec1b938ddc8da367c594105bfaa7485c80564 (patch)
tree7a25a7591b74a2eed33265838681a8a54115f7e5 /rs/java/android/renderscript/RenderScript.java
parent72d3cef8675b4a8eced300adeb148a835b7fdd57 (diff)
parent085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd (diff)
am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd': WifiP2pWfdInfo set device type bugfix
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions