tree 215fd459ecce5fab287e51e18c3db62cd20ebb69
parent 06daf3ca086932a150c9413c1756c534755941d8
parent ea77b790e4ba0b56fb7e43c48b91817d260dd753
author Baligh Uddin <baligh@google.com> 1350663512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663512 -0700

am ea77b790: am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev

* commit 'ea77b790e4ba0b56fb7e43c48b91817d260dd753':
  Bring dummy cling strings back as 'strings'