am 20135337: (-s ours) Import translations. DO NOT MERGE
am: 64363b84e3  -s ours

* commit '64363b84e3850486220ddf143169e21bdcc97bf6':
  Import translations. DO NOT MERGE
tree: 71699c7e54d90a119df4039851804ffc096bf570
  1. chromium/
  2. nullwebview/
  3. Android.mk