tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 86759f2d41255195e5155af2b8438bde70cd25a0
parent 20985b6edc4dcacbf2be39e5619f281577e769d1
author Baligh Uddin <baligh@google.com> 1392410109 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410109 +0000

am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '20985b6edc4dcacbf2be39e5619f281577e769d1':