tree aa67ef7f828d142145fddc8675dcf42e360dc4e2
parent e326af3cdba9f8e2a1a8626dc48524410d84e6fa
parent 43741a8c8371e3a473794cc2d2a81dda777e8724
author Geoff Mendal <mendal@google.com> 1418838309 +0000
committer android-build-merger <android-build-merger@google.com> 1418838309 +0000

Import translations. DO NOT MERGE
automerge: 43741a8  -s ours

* commit '43741a8c8371e3a473794cc2d2a81dda777e8724':
  Import translations. DO NOT MERGE