OSDN Git Service

am 0de0fe0a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 3 Nov 2014 18:07:47 +0000 (18:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 18:07:47 +0000 (18:07 +0000)
commite93c6c0ed764d6576c1de3d40d5d7eb311bfacc4
tree616d72f2abbb21ba97ccc1055815958a7cae57c0
parent7833aae7822c2e636c50c3756b894ee86c1072b8
parent0de0fe0afcd57c5c831202bb04bbd15365f0e071
am 0de0fe0a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0de0fe0afcd57c5c831202bb04bbd15365f0e071':
  Import translations. DO NOT MERGE