commit | 25b5b3d7a988c9e8bf5f7e2e0fbfa6f2bb954809 | [log] [tgz] |
---|---|---|
author | David Su <dysu@google.com> | Mon Nov 04 19:15:21 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 04 19:15:21 2019 -0800 |
tree | e40568b5fdad15930ead456fc7710bf64fc63ce5 | |
parent | 27e8967f2d8a490e0ed72ea7cb999683ab791207 [diff] | |
parent | fa055b3b0f66d8c2ca237fc411c61fa1d54a524e [diff] |
[automerger skipped] Accept either MAINLINE_NETWORK_STACK or NETWORK_STACK permission. am: ca2390b534 am: 52421524ec am: fa055b3b0f -s ours am skip reason: change_id I0c431e27ea6f5d46ebf9e32c283040889bd48056 with SHA1 9306914524 is in history Change-Id: I20f2cc72fa8acce6db50b6acd1e6e44bdc239722