diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:09:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:09:48 +0000 |
| commit | e5e4d0b8998e738cd2cae4e2176d6f507827f099 (patch) | |
| tree | 976d16598fcc17fa7911720f6bc20e0e2b4a6c67 /opengl/java/android/opengl/Material.java | |
| parent | 7034afaec9b2723dc4b53d1a1f68efefe96f6030 (diff) | |
| parent | 4c5b1d891fb5b43060e169ead7fd584a19f2e1b1 (diff) | |
Merge "Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev am: 809bf93563 am: d03b501796" into rvc-d1-dev-plus-aosp am: 4c5b1d891f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12106109
Change-Id: I2bc267ebd37a82c53d5299d519f2b5a25d36e1fa
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions