OSDN Git Service

am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
authorGeoff Mendal <mendal@google.com>
Mon, 6 Oct 2014 19:17:23 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Oct 2014 19:17:23 +0000 (19:17 +0000)
* commit '712363889899bfff564a39ef4d88ff048a9e5ec7':
  Import translations. DO NOT MERGE


Trivial merge