tree f59be4d582e68d1ed4430e7da46d59229b364bf8
parent 61854931252710cedbb596918dee6524723d1223
parent dfe0c29383049b269094a51fd74e693a8cb9b5b0
author Michael Jurka <mikejurka@google.com> 1349969097 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349969097 -0700

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

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