tree 7a3793b7d7f1007e5e89fad2b3423a1b99340b73
parent fbc17c9e2f39e2d15f9bef1c4ce03b1cfb4c00e1
parent 43323cc306adaae144457f29c0b0860d4f21f257
author Geoff Mendal <mendal@google.com> 1389823750 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389823750 -0800

am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '43323cc306adaae144457f29c0b0860d4f21f257':
  Import translations. DO NOT MERGE