tree f59be4d582e68d1ed4430e7da46d59229b364bf8
parent c476f09d4a8c37c16e352cbcf3745e1b33ede7fb
parent 80d64c28f45e0378e05021dc9222982b3d67150e
author Michael Jurka <mikejurka@google.com> 1349969167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349969167 -0700

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

* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
  Add entries for string resources that appear in clings