tree a1d87b4d21aeb58a3548d1ab29787f68ac06d179
parent 9d831a89aad6ce764e39a764fb0ed6f4cb7b712a
parent d58535c46a5cef02a501fa10eeedbce95e8324cb
author Bill Yi <byi@google.com> 1486110888 +0000
committer android-build-merger <android-build-merger@google.com> 1486110888 +0000

Import translations. DO NOT MERGE
am: d58535c46a  -s ours

Change-Id: I2d27c299b7a3e114096439d791c11655369a4b33