tree 10da860fcff71886af91d082e31f0e1917926848
parent 3d57f657e682d634ff0c089ce36efe6d82b9de49
parent 82f10acfbac51eeefcaf2cdf1bd4263f5c367d05
author Sunny Goyal <sunnygoyal@google.com> 1422666476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666476 +0000

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

* commit '82f10acfbac51eeefcaf2cdf1bd4263f5c367d05':