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)
* commit 'eed3237c8ffd8f724b0e72e9209adb5b4209763f':


Trivial merge