[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
tree: e40568b5fdad15930ead456fc7710bf64fc63ce5
  1. service/
  2. PREUPLOAD.cfg