OSDN Git Service

am 78ed71c6: (-s ours) am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 20:20:13 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:20:13 +0000 (20:20 +0000)
* commit '78ed71c68a246d34154a03b7e5661e73dbd97e26':


Trivial merge