tree 60f6e3726e8f36b802ddbe4e389e763471e7dfc0
parent 05565f5f01d062672dc27ffce5a2f85227c4bfaf
parent e6401ece8a3502b9ad4329a572b596175676f1d0
author Baligh Uddin <baligh@google.com> 1350663379 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663379 -0700

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

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