OSDN Git Service

am e91f7eef: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:18:58 +0000 (11:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:18:58 +0000 (11:18 +0000)
* commit 'e91f7eeffe83f35ade6f636369a2d4b7c1c260fe':


Trivial merge