commit | 175605dd2779ed5ed2730b2cb5bf0dd0e3a86a61 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 29 04:41:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 04:41:02 2020 +0000 |
tree | 41e2da029ca5fdd40af7be2cbd77948cc56751c8 | |
parent | e5fdcd86a2f24816c0fa6bf98c4fdf4b1ab280a3 [diff] | |
parent | a2d6b35eebc30d9e5d543e2487dd330e78076d21 [diff] |
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -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: I1e88786727ec4a32665bf4b36e66f39bd58c672b