tree 279c047910e6a50ac9086184bdbda24e1e40067c
parent a7911cd8cf63680637f1ae370c4462fd7951dcf0
parent 156b11cfc763415581f5b45d6cb4936f892dba6d
author Bill Yi <byi@google.com> 1479693998 +0000
committer android-build-merger <android-build-merger@google.com> 1479693998 +0000

Import translations. DO NOT MERGE am: a8c56ae30f  -s ours
am: 156b11cfc7  -s ours

Change-Id: I93596ee5a055f7e154ed355e16377ccd67c43bc5