tree 5fc605d9d4b6a3401e3861ee58a0b619a7a4739f
parent 5fdf2a79cdcaf2fe44769e8fcaf21ca02261b0a2
parent 5b4d811ef37208d289ae3da269551332eebfde68
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516854219 +0000
committer android-build-merger <android-build-merger@google.com> 1516854219 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 787835b3ac skipped: 1756b969e8
am: 5b4d811ef3  -s ours

Change-Id: I19b100f77134ca2198eb2ebb617cff6cf492aeeb