tree 9ef5173a03a9333a34ad410b6a4767a099fe48da
parent c5a764f68c26edd9de0590d4b1797856fed7d2a2
parent 883077a217a7c488a0aa6c6389ba72c71df00ce0
author Sunny Goyal <sunnygoyal@google.com> 1408711908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408711908 +0000

am 883077a2: Merge "Adding strings for the new clings." into ub-now-porkchop

* commit '883077a217a7c488a0aa6c6389ba72c71df00ce0':
  Adding strings for the new clings.