summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2020-05-15 21:20:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-15 21:20:54 +0000
commit1ac9999d997c6fddd4073ac341fc898c03d81a8b (patch)
treec2a8b68e561116c79f04f4fe617b553378d8f710 /opengl/java/android/opengl/Material.java
parentdb17516b1ce1efa05bcc542b56763b8a2fffebf5 (diff)
parent7cf0e15ee8be35b409843f701411d660072bfc23 (diff)
Merge "Don't attach PendingIntent if settings app is hidden." into rvc-dev am: 8ba3431761 am: 7cf0e15ee8
Change-Id: I5a79c66aadb6ef6f33c63b899c9b6ce0fd8f98fe
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions