tree 9a6acfd017475834be1dd6347125bcd02b21743a
parent be13c6fed06460da6dbf7cfa74ffb3a6ae50469d
parent 769cc4c1d06bb6b0d0365a62afeac8436edf52bf
author Geoff Mendal <mendal@google.com> 1458570677 +0000
committer android-build-merger <android-build-merger@google.com> 1458570677 +0000

Import translations. DO NOT MERGE am: 386239e  -s ours am: bf5690c  -s ours am: 163240e  -s ours
am: 769cc4c  -s ours

* commit '769cc4c1d06bb6b0d0365a62afeac8436edf52bf':
  Import translations. DO NOT MERGE