OSDN Git Service

am 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:31:53 +0000 (11:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:31:53 +0000 (11:31 +0000)
commit226b8d30d09a2626fc379ff0c7411786a191b4ed
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parentfde014516f884e957a1fdcd0a4c8d8ff71c0f47c
parent329cea489bee113ff6534ba8cd0f981052d22bc8
am 329cea48: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '329cea489bee113ff6534ba8cd0f981052d22bc8':