summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorNicolas Prévot <nprevot@google.com>2016-04-15 09:52:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-15 09:52:56 +0000
commit428fdd104c6877889da1af2d35af41d5c14833c9 (patch)
tree82b65faf0b28ebd8c135d16f601383ffdc4f20e9 /rs/java/android/renderscript/RenderScript.java
parent88bc0bbb13cee43e777fd88c2681d1f033faece5 (diff)
parentc662898a182ca8f13d73b71649feeeeceb574edd (diff)
Merge "Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator." into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions