tree 05178a81061b55b44c37550f7ad31c9030da6810
parent e309a7f951aa2c6bc0337a1324cbb237c641d8ca
parent 57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2
author Geoff Mendal <mendal@google.com> 1448300775 +0000
committer android-build-merger <android-build-merger@google.com> 1448300775 +0000

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

* commit '57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
  Import translations. DO NOT MERGE