tree b216f1ecc2a2d6405f17cef0273d8e3b4c05c1d6
parent a038e71dcb422a75d8a8da74a15d31e7cf64219a
parent 74c697c7102c66c37f1588201750236234f20b12
author Michael Jurka <mikejurka@google.com> 1349969270 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349969270 -0700

am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev

* commit '74c697c7102c66c37f1588201750236234f20b12':
  Add entries for string resources that appear in clings