OSDN Git Service

am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Dec 2014 19:47:03 +0000 (19:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 19:47:03 +0000 (19:47 +0000)
commit31457ead0fd81b8c83da68873c7c0608d43aac7d
tree981e1646d5f30e0a5eeb473f1151a03bbfff13d4
parent835e71910129eb376d40c7bc92ea858b3b76a168
parent9e8637411a2a637e5795ff721ea6a92141cf76ec
am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '9e8637411a2a637e5795ff721ea6a92141cf76ec':
  Import translations. DO NOT MERGE