tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 8a1b5bc61e97d012169d42127b077aa6a2a07791
parent f97d939fbebe04f815761d32061790f0b8a17d5d
author Sunny Goyal <sunnygoyal@google.com> 1422685307 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685307 +0000

am f97d939f: am 48b1afd0: am 82f10acf: am 883077a2: Merge "Adding strings for the new clings." into ub-now-porkchop

* commit 'f97d939fbebe04f815761d32061790f0b8a17d5d':