tree b727a606a6def71105478ba854c33cc00665a803
parent 1a3c0290493a82530e7d70873885ba84c48a4b0c
parent e0ef642c08d048dce5a403100fe1e89bbf976407
author Bill Yi <byi@google.com> 1520032705 +0000
committer android-build-merger <android-build-merger@google.com> 1520032705 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 8c8bc9be80 skipped: 2edfa5fe9e am: 2ff848a964  -s ours am: 11e90e6865  -s ours am: 5f4561f90e  -s ours
am: e0ef642c08  -s ours

Change-Id: Ie7a0132fc4671371e14942c8a2917dd2d06a90ca