diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 19:22:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 19:22:14 +0000 |
| commit | e72f9d78d0a2ded05b0fafee4d1984db8c625414 (patch) | |
| tree | 66823ebc1adc32e20831f32868b7207edc9ff29b /opengl/java/android/opengl/Material.java | |
| parent | a6b6db034508c20918eaa3ea4653150ce40588a5 (diff) | |
| parent | ef6ce7ff053bc4b998b501d23a99118cab820c6e (diff) | |
Merge "[automerger skipped] Merge "CEC: Run all actions after TV allocates address" into rvc-dev am: f1c35c396d am: f8d2e19d56 am: 77d0f34b04 -s ours" into rvc-qpr-dev-plus-aosp am: ef6ce7ff05 -s ours
am skip reason: Change-Id I9a79ee02f5065abbedded26be385115279797977 with SHA-1 1c7270afd2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953479
Change-Id: I339cf7f2abbe0945aada316a4bf818bbd3187d9c
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions