tree f59be4d582e68d1ed4430e7da46d59229b364bf8
parent 260eb9c6ff598d792b51e5c24608602a1f5b1504
parent 22beb9043ece33455a3969e074da06073b610b49
author Michael Jurka <mikejurka@google.com> 1349968989 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349968990 -0700

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