summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-01 22:06:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-01 22:06:38 +0000
commit104f2bd01cb75222cbf63b854042f796970dab2e (patch)
tree01faf50304ce996d557772146f67b16c3c28059e /opengl/java/android/opengl/Material.java
parentf06a12f128e7c29474c12a26e807c479402a45fb (diff)
parent4f02a4cb65ecae4eb60b77ba1f4f3a57228b2645 (diff)
Merge "Merge "bypass INTERACT_ACROSS_USERS permission check when binding to singleton service for non-0 userId" into rvc-dev am: 4cdb5ddeb4 am: 0b5b15c422 am: 64e4d1d0ff" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions