OSDN Git Service

am 4f93a2ad: (-s ours) am e60acac3: (-s ours) am 6cd00e14: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 00:11:27 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 00:11:27 +0000 (00:11 +0000)
* commit '4f93a2adef32cd6b038a0a888bb3496559e9a73a':
  Import translations. DO NOT MERGE


Trivial merge