| commit | 13b311feb9b3b031d91d5ac4b1bd3ac5f31f2e77 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 29 05:05:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 05:05:28 2020 +0000 |
| tree | 97dd94c1b2e7c234b3f459180c2e01347f1f3cf8 | |
| parent | e621259bc8c75ae7208d9a9d0a79cd7671a1825c [diff] | |
| parent | 060d67dbf1bec8eef2b60053fb2c3e9fbadf0bdd [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: 060d67dbf1 -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: Ibf8a32647cda56751960107bca8ef55df2f9cefc