tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent c787609e6dba3e9de96cf94e9b8cf057911149d9
parent 957c65fe137b02a1a57833746b4e9655e22ff1a1
author Bill Yi <byi@google.com> 1479952977 +0000
committer android-build-merger <android-build-merger@google.com> 1479952977 +0000

Import translations. DO NOT MERGE am: d730a04ef7  -s ours am: db360b65d4  -s ours
am: 957c65fe13  -s ours

Change-Id: I01680e8da0f8b18b5de1f4acf0c9d421b5acf936