tree a1fea658839598021eed89bce5fb0ed3b0a36078
parent 09c0d2618c0873dba636266f0abe1f561bd0c02d
parent d5cf4a6ff61fd21b860f1094612a3d342cacda6b
author Baligh Uddin <baligh@google.com> 1402144424 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402144424 +0000

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

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