tree 5f295f74f6efb543a6b40770425f0a9943362f35
parent c3b43723040798ea29ebe6bfe046990c4d7e0f64
parent db8d7374ffb371af05d21ad98831cea1954500a8
author Bill Yi <byi@google.com> 1470780746 +0000
committer android-build-merger <android-build-merger@google.com> 1470780746 +0000

Import translations. DO NOT MERGE am: 9067a591c6  -s ours
am: db8d7374ff  -s ours

Change-Id: I807de426a9d776526d251c7c678483733edb406b