tree a057c49d9b7d562f6f4766e431987efbddb77637
parent dcd4a64f66b05d32dfec0fa2d0bf344273d9758f
parent bd620a7de1b171ac54ce1268e12d1757c0baa86d
author Geoff Mendal <mendal@google.com> 1453131840 +0000
committer android-build-merger <android-build-merger@google.com> 1453131840 +0000

Import translations. DO NOT MERGE
am: bd620a7de1  -s ours

* commit 'bd620a7de1b171ac54ce1268e12d1757c0baa86d':
  Import translations. DO NOT MERGE