OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:21:10 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:21:10 +0000 (15:21 +0000)
commit5f9c41bfdfbd8801dd379b6930d4f45406cc74e5
treeed69da0ea435ffa905f235fd97050587b04356f9
parent523b80618842df4c5a8ef542ef8f5868e3c9d932
parent05675b78ca4ff3a100dcf4797d0e85a92fb8d431
Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db  -s ours
am: 05675b7  -s ours

* commit '05675b78ca4ff3a100dcf4797d0e85a92fb8d431':
  Import translations. DO NOT MERGE

Change-Id: I4cf4b39255aa87beb38c2d9cae170b52a18cfeb1