tree 10da860fcff71886af91d082e31f0e1917926848
parent 2eb364236718340578f99385f7c0e2a5f9c33d1c
parent 1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02
author Baligh Uddin <baligh@google.com> 1422666482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666482 +0000

am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02':