OSDN Git Service

Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
authorLorenzo Colitti <lorenzo@google.com>
Fri, 7 Apr 2017 05:21:23 +0000 (05:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 05:21:23 +0000 (05:21 +0000)
am: fa84050a7e

Change-Id: If1abfc3a7ee596e23257d0259bc5d0243f31e82b

1  2 
core/res/AndroidManifest.xml

Simple merge