tree 13ae6253e45c0fc6274177c58542c410d210b3ed
parent ac648a92498561418445ba62158ff328c81f3c8c
parent 0256289bf6ba726643c74c7dd6b8684e628dbcb0
author Bill Yi <byi@google.com> 1498918132 +0000
committer android-build-merger <android-build-merger@google.com> 1498918132 +0000

Import translations. DO NOT MERGE
am: 0256289bf6  -s ours

Change-Id: I16a31eb9135752d2db6a1b4b560d76efdc0f9ae8