tree 9c5c210880fdea40376dbc2d83a8538eef5d2a9a
parent da1e7292978869bd47d657b9f82b6049704456a6
parent 59c8cee55f98170bbe14bf6cfdb2277fded4d3d5
author Baligh Uddin <baligh@google.com> 1411581507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411581507 +0000

am 5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '5de699d1bc625e81f19c1c50916f8666f2da76da':
  Import translations. DO NOT MERGE