OSDN Git Service

am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev
authorLifu Tang <lifu@google.com>
Wed, 4 Sep 2013 00:16:14 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Sep 2013 00:16:14 +0000 (17:16 -0700)
* commit 'f4c4294c502d774c1c56d6b2dca56a604cc85f87':
  Renamed "Location services" to "App settings"


Trivial merge