OSDN Git Service

am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Mon, 24 Nov 2014 20:49:28 +0000 (20:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Nov 2014 20:49:28 +0000 (20:49 +0000)
commitdb3b7b5846d3a047d5a049fd1f931b8a87b46b68
tree65451653def0aff52d7c3870dbda4772411835fa
parent58b699c366dea7abc26f34c1e5f1cc6031c04e23
parent597226d6f2adb3fd70d669e168a2d6171222ad1a
am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '597226d6f2adb3fd70d669e168a2d6171222ad1a':
  Import translations. DO NOT MERGE