diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 19:39:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-27 19:39:37 +0000 |
| commit | e7a2a69ba4c5268f768ce3c521a582a3fcc88452 (patch) | |
| tree | 935a3ee0a8e173dc866cc41528ab220f827c367a /opengl/java/android/opengl/Material.java | |
| parent | 7597b022831d2cca0e17b6200ef4cc04b6676300 (diff) | |
| parent | e6372122945aa3d1ec9e6e59975a123f38b0478d (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
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions
