tree 0228c42aa4201f5d331c40f8b3e0177b9100c829
parent 26b50fdcd85bcd388442f300a4731d8fc2318f37
parent b45f1999a4b1abd67b624937a3eb9c919b34ddec
author Eric Fischer <enf@google.com> 1336586190 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336586190 -0700

am b45f1999: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'b45f1999a4b1abd67b624937a3eb9c919b34ddec':
  Import translations. DO NOT MERGE