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)
commit0574c26c36b1b760d80107fb4171cdcb642aabf1
tree5e40d89b427ceb56880a9144f5bfaeccd896ddf2
parentfa6faf95bc70fee95093f7c7bd1b6a540a95fe03
parentcabe7e821886f560e2bff7d2528069308458dc98
am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
  Settings app supports location settings injection