OSDN Git Service

am 26fa5188: (-s ours) am 27259b53: (-s ours) am c8131cb9: (-s ours) am e8de72e5...
authorGeoff Mendal <mendal@google.com>
Mon, 17 Mar 2014 20:55:49 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 20:55:49 +0000 (20:55 +0000)
* commit '26fa5188c79836a328b28bdeac65cd7fa8894bd4':
  Import translations. DO NOT MERGE


Trivial merge