OSDN Git Service

am cc5c15d7: (-s ours) am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:26:36 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:26:36 +0000 (17:26 +0000)
commit645b118450dbaf68cb6c76e623b68d6545ed4051
treeb3f336f2df2223e420da65cdd8f542120d2c8d36
parent8334cf1f3d594a4a54d2bf6bce86a7b770005f5c
parentcc5c15d7e24c7ee06920dc8ca0ccfdce1fccd722
am cc5c15d7: (-s ours) am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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