OSDN Git Service

am 55db89fb: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:07 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:07 +0000 (11:19 +0000)
commit6a49f18dafd829d0de18030371af5e7fb47150d4
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent6fdc1c51e56be2e0ca0257073bf1f49af883f338
parent55db89fb9be8684398cf5abf7a52f6980d33ea9a
am 55db89fb: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '55db89fb9be8684398cf5abf7a52f6980d33ea9a':