tree c69888479880dd8e1720d1f53b877c67e5444598
parent 82128ffa25de7a678658e0878f1a348acecca3ea
parent 635f3033ae4799cd38515c56d21bd33253c62418
author Geoff Mendal <mendal@google.com> 1458570821 +0000
committer android-build-merger <android-build-merger@google.com> 1458570821 +0000

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

* commit '635f3033ae4799cd38515c56d21bd33253c62418':
  Import translations. DO NOT MERGE