tree e6282c4df9e1255dfc8a5c5a58ea1d436a1390c0
parent b2c4b38e6c53f9bf7d5df2723f256234e61312e6
parent 951dad2b5af6be7c1b0490153f5c3f1f727da64f
author Eric Fischer <enf@google.com> 1322675878 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322675878 -0800

am 951dad2b: Restore deleted string still referenced from manifest.

* commit '951dad2b5af6be7c1b0490153f5c3f1f727da64f':
  Restore deleted string still referenced from manifest.