OSDN Git Service

am b0d49833: (-s ours) am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 25 Mar 2015 15:57:12 +0000 (15:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Mar 2015 15:57:12 +0000 (15:57 +0000)
commit51914e7e250ed9406d936ad1746d44507686a1e1
treeed2a7ae9c564d6f2c24b509e937605777759530c
parenta5ccc25fb797d45f39485319b463b1518ab5a115
parentb0d49833be8a00a8466aeea6a839869371a90425
am b0d49833: (-s ours) am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

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