OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)
commitd1ec21e26a31ed1e91730029ba75f7f3fc580bb1
tree95eac66b15e1f90abd34b7a6081bb4ce5249aca9
parentd75716b04f0ddc924eecf1889a84b8af6d96288e
parent41221300053a208fd39ed13228102dc7a0a8966f
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 4122130005  -s ours

Change-Id: I2688851beb78619270d8cb6dc077992b9cec037d