tree e62765c3b850cc413a379431fadc12cb9af03284
parent 5863d2cbdc66ef2513765e29b48c0b470810e883
parent 6e8333bf05deecaae1ff4613b915842798557670
author Bill Yi <byi@google.com> 1502086263 +0000
committer android-build-merger <android-build-merger@google.com> 1502086263 +0000

Import translations. DO NOT MERGE am: 433cb3227c  -s ours am: de8c1dfbad  -s ours
am: 6e8333bf05  -s ours

Change-Id: Id63bb127d3118984e39ac1741a79dd43f65143d1