OSDN Git Service

am c483a5e3: (-s ours) am 5a761be3: (-s ours) am 7d521a8f: (-s ours) am f598d0bc...
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 12:47:52 +0000 (12:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 12:47:52 +0000 (12:47 +0000)
* commit 'c483a5e3fc3377c5ea3535e908c60ba1ac901936':
  Import translations. DO NOT MERGE


Trivial merge