| commit | bad68f2de7853a1080bda14b0adc820962e3b957 | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Thu Mar 19 18:42:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 19 18:42:36 2020 +0000 |
| tree | 4f244d0f234b4afba31ce6e270ea70ed2795d7de | |
| parent | e7a64b3aa02c31ee07aa463dee79bd66d7dd1b4d [diff] | |
| parent | 409f9a5b24562d690f7f94607325441bec34fa6a [diff] |
[automerger skipped] Merge "Update NetworkCapabilities administrator UIDs to be int[]." am: 668619a32d -s ours am: 409f9a5b24 -s ours am skip reason: Change-Id Ifb807df34851d39cf996a3a0a96cb50c8ca14771 with SHA-1 e2887be39f is in history Change-Id: I73bee1921186f0520e8cbcb6e642910f8fac9cf5