tree 10da860fcff71886af91d082e31f0e1917926848
parent 658fdd291b1bfaf7e7dbe40c34ecbf757a100d87
parent b17186c7a451c29ff370aa0d8b590b2d10a600f4
author Baligh Uddin <baligh@google.com> 1422666493 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666493 +0000

am b17186c7: (-s ours) am bc566e74: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'b17186c7a451c29ff370aa0d8b590b2d10a600f4':