tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent a8808fd4c6e3a0c92c4c86cfc3d0bbff951c7e29
parent d2fca6b2cda730ef5bb982dc7a0cd28730aa9993
author Bill Yi <byi@google.com> 1479953332 +0000
committer android-build-merger <android-build-merger@google.com> 1479953332 +0000

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

Change-Id: Ic99ef3ce3fce7ab038ef4d7fecabeb8a9c579450