OSDN Git Service

am eed3237c: (-s ours) am 4e9ef0aa: am 52c8bd50: Merge "Add a new SystemApi, getPrivi...
authorChelsea Derrick <chelsead@google.com>
Thu, 17 Jul 2014 18:26:27 +0000 (18:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:26:27 +0000 (18:26 +0000)
commit562ad02d385e85cf847e29f82546ae4cd82f2435
tree56d7a1958ea12893c0298323085141f0e07928ae
parent432631d3bcff5f2933c7c41eb086fd14fc641f9b
parent6a3bea7b254107de71661f2898695a623a6afa4a
am eed3237c: (-s ours) am 4e9ef0aa: am 52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev

* commit 'eed3237c8ffd8f724b0e72e9209adb5b4209763f':