tree 8f056e90b0867998cf1eb0960e2be4d403038488
parent e3097351bf3f178c0d678654fcfa3bc041f2f540
parent ad9a1c47bbd13e6bc87406113de9c70b65e33bab
author Bill Yi <byi@google.com> 1474082455 +0000
committer android-build-merger <android-build-merger@google.com> 1474082455 +0000

Import translations. DO NOT MERGE am: 8a18ea0a1d  -s ours am: c5a329d7cf  -s ours
am: ad9a1c47bb  -s ours

Change-Id: I16f663bbf87476e9cdc778c3243cd8601254ac53