summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-22 21:35:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-10-22 21:35:15 +0000
commitb7357aca03bd9fc0e625e0204be703ae8605b29a (patch)
treeabd1dceab77cdd438f61f05b472bcadb86a6b2fe /rs/java/android/renderscript/ProgramStore.java
parent5abd8781fd13af1a0dde7754fa30e35bfe43db74 (diff)
parent2b24ea5a8739a4bf8b4b271550ed707881d162d2 (diff)
Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master
* changes: Merge changes from topic "telephonymanager-data-policy" am: 3a14c6bdcc Add new methods for setting mobile data policy am: 83bb093cc5
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions