OSDN Git Service

am fbc17c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
authorGeoff Mendal <mendal@google.com>
Thu, 16 Jan 2014 19:22:59 +0000 (11:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 19:22:59 +0000 (11:22 -0800)
* commit 'fbc17c9e2f39e2d15f9bef1c4ce03b1cfb4c00e1':
  Import translations. DO NOT MERGE


Trivial merge