tree 60f6e3726e8f36b802ddbe4e389e763471e7dfc0
parent 964e2a63c29ed81c2dbd82a3386fda2af7d4662c
parent 41aeb57975a9851740a849dbaf273cfc8f56cc70
author Baligh Uddin <baligh@google.com> 1350663072 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350663073 -0700

Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev