OSDN Git Service

am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 21:49:18 +0000 (21:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 21:49:18 +0000 (21:49 +0000)
* commit 'ec28103983e6b51d582eeff8df8f3a4e3aeab2a2':
  Import translations. DO NOT MERGE


Trivial merge