OSDN Git Service

am a40fb237: Add Safety information to Settings > About Phone
authorWink Saville <wink@google.com>
Sun, 27 Sep 2009 19:00:01 +0000 (12:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 27 Sep 2009 19:00:01 +0000 (12:00 -0700)
commitbfcb8900804cc9e7e18ef60805d994dcf53a45c7
tree1fa0dd4635ebcfed6eec66eac6a5d920f6bfade5
parentd13e95cc2605c3ffe9d961d2e2c269c9179b5007
parenta40fb23734cc5d5ac6e69a060cbb488269ad8af3
am a40fb237: Add Safety information to Settings > About Phone

Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp

* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
  Add Safety information to Settings > About Phone
AndroidManifest.xml
res/values/strings.xml