OSDN Git Service

am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission descript...
authorDirk Dougherty <ddougherty@google.com>
Mon, 3 Mar 2014 22:24:14 +0000 (22:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 22:24:14 +0000 (22:24 +0000)
commit0054ed815a3db340a27d8a179d3b748bf3eeaaf0
tree4fd16eb7fc16fe1f6646b6b481242e5f96b63d13
parent1fdcab956d55418febbbc0f5928242c3420bd16a
parent8bb3b8f805658ecf9106778992dceea9a05dcc4c
am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit '8bb3b8f805658ecf9106778992dceea9a05dcc4c':
  Update permission description string.
core/res/AndroidManifest.xml