OSDN Git Service

am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 25 Mar 2015 15:50:43 +0000 (15:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Mar 2015 15:50:43 +0000 (15:50 +0000)
commitb0d49833be8a00a8466aeea6a839869371a90425
treec2d62dbfc62e63bfc0d259c43a7b20030f204dbc
parent3325448639df3ae629fbb33666c9e6c25d306a28
parentd86a584f101a5932a8fa2b686ef052e22e004854
am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

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