tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 02f10e501bd7d268c9bc0a3306cb18902aeebb6e
parent e41059eb983e787ef68fddb0f4c2c1ead7f88944
author Baligh Uddin <baligh@google.com> 1422685368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685368 +0000

am e41059eb: (-s ours) am ee82d2f2: (-s ours) am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'e41059eb983e787ef68fddb0f4c2c1ead7f88944':