OSDN Git Service

am 1180831b: (-s ours) am bfa09525: (-s ours) am a6b02708: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:20:34 +0000 (00:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:20:34 +0000 (00:20 +0000)
commit5fec1b384a80bcd10b017c7d540ca06d42e465de
tree63dee15c2ef77c6a1b8bae829817531ae77d62c1
parent531f39e2c8ac1640f25dc047cb89a4341ad4f5c2
parent1180831b64a9358946ef96e0e751bbade5f9dece
am 1180831b: (-s ours) am bfa09525: (-s ours) am a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '1180831b64a9358946ef96e0e751bbade5f9dece':
  Import translations. DO NOT MERGE