tree 03797a63799d658e4f06bcd310c848c3c91bddde
parent 12209b9afed4aff5b219d704c49d0f0c12e3cc52
parent 4b66f74aaec86f2719ebd6f4a6d396ecee0540a2
author Geoff Mendal <mendal@google.com> 1448301222 +0000
committer android-build-merger <android-build-merger@google.com> 1448301222 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc  -s ours am: 57b3e7508d  -s ours
am: 4b66f74aae  -s ours

* commit '4b66f74aaec86f2719ebd6f4a6d396ecee0540a2':
  Import translations. DO NOT MERGE