OSDN Git Service

am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 17 Nov 2014 20:20:39 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Nov 2014 20:20:39 +0000 (20:20 +0000)
* commit 'e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e':
  Import translations. DO NOT MERGE


Trivial merge