tree cd163490f93f4336defd0194280a1ed533141087
parent 1c91aae22094d4bd259933e0b557eed3a6cf157f
parent 00f5b5b3353d18aece46bacfc08b3d9373f986a0
author Geoff Mendal <mendal@google.com> 1447252682 +0000
committer android-build-merger <android-build-merger@google.com> 1447252682 +0000

Import translations. DO NOT MERGE am: 5ca7a9b7cc  -s ours am: 71834c4da4  -s ours
am: 00f5b5b335  -s ours

* commit '00f5b5b3353d18aece46bacfc08b3d9373f986a0':
  Import translations. DO NOT MERGE