summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2016-04-11 17:58:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-11 17:58:18 +0000
commitb53874e71459af4461d12fa626a39d02d98cf2b3 (patch)
tree387a1154e93cbbfe5c13190524dff2e5ee49f341 /rs/java/android/renderscript/RenderScript.java
parent76961ccc52c5cb9d73336782be2d74c23600c5a3 (diff)
parente68b127525c23e8e0cbe1e9dee75534d99e2833d (diff)
Merge changes from topic 'carrier-app-race' into nyc-dev
* changes: Disable preinstalled carrier apps earlier in boot. Move CarrierAppUtils into frameworks/base/telephony.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions