OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 23 May 2016 15:57:49 +0000 (15:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 15:57:49 +0000 (15:57 +0000)
commita882b8c15069b84c47fe2b79ec7fe0935aebe995
tree812102b371f0e480b0fc896d64c7e5b5a1d3347f
parent712c2cb2d24d08b6a2d8d9344609be67542002ef
parent6a983faab35cc4f22611b0cb8041f4dcbac545dc
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: If7150468a26a9a259b7696d2ee3594518ba0a213