OSDN Git Service

Merge "Add NETWORK_STACK permission" into oc-dev
authorLorenzo Colitti <lorenzo@google.com>
Fri, 7 Apr 2017 12:48:26 +0000 (12:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 12:48:26 +0000 (12:48 +0000)
commitfe523c4917ba01fc2d0942261a026304ce193e15
tree234b168edeba2c10f5fe6bca58ad3f45d0c9a1a7
parent3b3bf871652c79aa7b655f64e5ab7f438ce5f735
parent087daa0da55b892b30aaedfa7fcbaa987cc12fd3
Merge "Add NETWORK_STACK permission" into oc-dev
am: 087daa0da5

Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e