OSDN Git Service

am 36c123ec: (-s ours) am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de...
authorBaligh Uddin <baligh@google.com>
Fri, 21 Feb 2014 11:15:00 +0000 (03:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 11:15:00 +0000 (03:15 -0800)
* commit '36c123ec6b74be058702a37e8a01702b505da5c1':
  Import translations. DO NOT MERGE


Trivial merge