OSDN Git Service

am f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 27 May 2015 17:09:49 +0000 (17:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 17:09:49 +0000 (17:09 +0000)
commit9d5c9f8683f2256c168ef2eefa270e7e7387d123
tree30f95b358763bd7e4e10f5479345d01f44ee839c
parentc1c98e6c3975114a3eface7ab070e98c5b9a05f6
parentf509067dfea7b8281683eda13af5485039ddc413
am f509067d: (-s ours) am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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