diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-26 13:47:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-26 13:47:03 +0000 |
| commit | 0c82027ed6a4c22635a6de3e9547d8b39e01015d (patch) | |
| tree | 7e34ad50b0a7dfe0ceab410e52efe661a189bc51 /libs/hwui/renderthread/EglManager.cpp | |
| parent | 55600cbe03a5f684a5f01fe89a2b55bf62c21b93 (diff) | |
| parent | 36d9389ddcfaa8a0a208257f63e6154e9e5019e3 (diff) | |
Merge "[automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: fbf205a380 am: bc7b68512d am: 627e36992b -s ours" into rvc-qpr-dev-plus-aosp am: 36d9389ddc -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 fbf205a380 is in history
Change-Id: I19602a98f7bf371d1cc0c742b82460c0480c2be8
Diffstat (limited to 'libs/hwui/renderthread/EglManager.cpp')
0 files changed, 0 insertions, 0 deletions