OSDN Git Service

am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev
authorTom O'Neill <tomo@google.com>
Wed, 14 Aug 2013 00:34:20 +0000 (17:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Aug 2013 00:34:20 +0000 (17:34 -0700)
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
  Settings app supports location settings injection


Trivial merge