tree 1fa0dd4635ebcfed6eec66eac6a5d920f6bfade5
parent d13e95cc2605c3ffe9d961d2e2c269c9179b5007
parent a40fb23734cc5d5ac6e69a060cbb488269ad8af3
author Wink Saville <wink@google.com> 1254078001 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254078001 -0700

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