tree 60f6e3726e8f36b802ddbe4e389e763471e7dfc0
parent d5bc834f413d08c6c9db89b0d27e636361661d51
parent 5b449dc3095192fecd4760d9f550de65e588e3dc
author Baligh Uddin <baligh@google.com> 1350663235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663235 -0700

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

* commit '5b449dc3095192fecd4760d9f550de65e588e3dc':
  Bring dummy cling strings back as 'strings'