OSDN Git Service

am a437a516: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 07:54:41 +0000 (07:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:54:41 +0000 (07:54 +0000)
commit58463380157c4d3796cf13f6564ab536e96f4cb0
tree715d547d2502de8d04de0ec12233b3183ce62c99
parenta654d94661316056ebc60032d4ec4c4a15cd3399
parenta437a51640b87f690d59d15b6b6020c718420f9b
am a437a516: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a437a51640b87f690d59d15b6b6020c718420f9b':