OSDN Git Service

am bf833850: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 07:54:25 +0000 (07:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:54:25 +0000 (07:54 +0000)
commit5699634c5662ddbe1cae332a9bd7c5200d36c5fe
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent9481262762e7708d77e67119d1774a2544215a5d
parentbf833850bf4adfd7413820919d7cccfdf9eba03a
am bf833850: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'bf833850bf4adfd7413820919d7cccfdf9eba03a':