OSDN Git Service

am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 14:54:45 +0000 (14:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 14:54:45 +0000 (14:54 +0000)
commit93c6f4fc3a0459bad43efd02097c3f133cc0679b
treed2658caf61ec2cb001e7fd6ccb93297d9b4d563c
parent7f15902c4bfaf2c74f7702cb68af03e9f9d08008
parent20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2
am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2':
  Import translations. DO NOT MERGE