OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:04:02 +0000 (17:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:04:02 +0000 (17:04 +0000)
commitf089201e2e574f6a3bce81253b385d6f67d20532
tree5e46eb197f768d83838afb7541ca9d1a01dda85f
parent67ae5a22517ff68547171588c09ae9ce3e95080b
parentef2989920d00f19d5dcd86bd521eec86bc058754
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ef2989920d  -s ours

* commit 'ef2989920d00f19d5dcd86bd521eec86bc058754':
  Import translations. DO NOT MERGE

Change-Id: I4c4da499fab8a30733235849a336876442e46125