| commit | 060d67dbf1bec8eef2b60053fb2c3e9fbadf0bdd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 29 04:52:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 04:52:35 2020 +0000 |
| tree | 41e2da029ca5fdd40af7be2cbd77948cc56751c8 | |
| parent | a2f94547f6079642d0edccdbda1f6f431aeaaed3 [diff] | |
| parent | 175605dd2779ed5ed2730b2cb5bf0dd0e3a86a61 [diff] |
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours am: 175605dd27 -s ours am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444 Change-Id: I24a63f122e3d09a1162ca2ee81d872f0f70c52ee