OSDN Git Service

am 714bc28b: (-s ours) am 7a3682ad: (-s ours) am 32037913: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 5 Oct 2015 15:48:22 +0000 (15:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2015 15:48:22 +0000 (15:48 +0000)
commit416565a8043b68b3bd13caa689c146561aa9c65b
treec89da9ce6365c618156f432b6d08bb9962086ab7
parent8af3e68309562f633892d1fb14b76b99be54c5d5
parent714bc28b9200680cc4333c00a803711b28f9537b
am 714bc28b: (-s ours) am 7a3682ad: (-s ours) am 32037913: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '714bc28b9200680cc4333c00a803711b28f9537b':
  Import translations. DO NOT MERGE