tree 0afa7d4bca2d1042f1cf3085c121967de2a92815
parent f8084b400db56192f9a6b115d5b4e03ca6b23023
parent 15eaee40a19c0d7391b5f209e4336e889be43297
author The Android Open Source Project <initial-contribution@android.com> 1348170530 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348170530 -0700

am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
  tweak recovery text images
  localization for recovery messages