tree cba62d0d64153aa2169651696bc238591341d679
parent c6ab204836f31c568731b0879ac20b70c38998fb
parent ef69114ffb59392c7f2f7872e1c27d2a43f35c21
author Baligh Uddin <baligh@google.com> 1414085222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085222 +0000

am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'ef69114ffb59392c7f2f7872e1c27d2a43f35c21':