summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2014-02-27 22:16:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-27 22:16:39 +0000
commit98bab263500b258025c9c6ca64f8aaff7dc914f4 (patch)
tree0c8314a0c1ff4c2574f4af554087dec518b266d6 /rs/java/android/renderscript/RenderScript.java
parent8a78a807097397ccd9c6ea20868f71c7ee19ef1d (diff)
parent4522bd12a4f3d2b0c3156fc70937f78bed15a1f8 (diff)
am 4522bd12: am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
* commit '4522bd12a4f3d2b0c3156fc70937f78bed15a1f8': Fixed upgrading from forward-lock application to system application
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions