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)
commit1614f854c55e078e9e8acf9d21009e262bb644f2
treeb9d73907120a836c904e1bb07dc1b21a204e0538
parent4fe6c6d91a0a46384450fb153a895d9145aed6fa
parentfa84050a7e51e2a6643ea242b43f16cd6e3114dd
Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
am: fa84050a7e

Change-Id: If1abfc3a7ee596e23257d0259bc5d0243f31e82b
core/res/AndroidManifest.xml