diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 19:58:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 19:58:56 +0000 |
| commit | d47df20dca5bec5d2e8a768ea01e9e51804fcd4a (patch) | |
| tree | 83d257c1d4ca0c7ed9b978da8e10102438f0027e /opengl/java/android/opengl/Material.java | |
| parent | aebb1b5eb7a395c77e40945b20a30d9d14958ea5 (diff) | |
| parent | e7a2a69ba4c5268f768ce3c521a582a3fcc88452 (diff) | |
Merge "Merge "App Pinning strings; security notes on startup dialog." into rvc-dev am: 0fda8bb2f0 am: 5212f83024 am: 194d6535c6" into rvc-qpr-dev-plus-aosp am: e7a2a69ba4
Change-Id: I1bb4328c4c2256dc6a8bd55eba9bc40e4721f8c5
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions