tree 10da860fcff71886af91d082e31f0e1917926848
parent c30daa6c15c5d2a9458c4bed656018302418647b
parent fc6dab311751300cde3031626d3dbacfd15614fc
author Baligh Uddin <baligh@google.com> 1414566446 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566446 +0000

am fc6dab31: (-s ours) am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'fc6dab311751300cde3031626d3dbacfd15614fc':