tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 19d76bb7ca777fb59c96fb627a2fd9eacd76dd50
parent 48b1afd013d6f0bf23f7e9531cb09088f4a7a234
author Sunny Goyal <sunnygoyal@google.com> 1422669688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669688 +0000

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

* commit '48b1afd013d6f0bf23f7e9531cb09088f4a7a234':