tree d26dc6dc861c69c8f80ae9aac9a13b14bee3381b
parent 4ce95408144b873b469b1049c91fdcd8fd48e3ef
parent 74a806e5efbfd4a37725f2f1e193c3c2eb973fb7
author The Android Open Source Project <initial-contribution@android.com> 1346947921 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346947921 -0700

am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7':
  fix format of installing_text