OSDN Git Service

am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)
* commit '6bee46a1b4cbfc420d9c020bbab3d7821de7acbe':
  Import translations. DO NOT MERGE


Trivial merge