OSDN Git Service

am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 00:14:59 +0000 (00:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:14:59 +0000 (00:14 +0000)
commitf1507ef3dd8b296329d514ec87a6efbcc8ac249e
treeab3fb6e024e4a137e33e078ba2e67b6d438df831
parent0998e03a8dfa01cf62649e2d277e0b8556b1ffc9
parent1e9aca417c87308cc95433fde1ed679b8ccff150
am 1e9aca41: (-s ours) am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1e9aca417c87308cc95433fde1ed679b8ccff150':
  Import translations. DO NOT MERGE