tree a7e583ab767375b0f4b0f062bc4bab9b06a110f8
parent 816a167b2936a420d96f57f57005982e727745f5
parent ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd
author Geoff Mendal <mendal@google.com> 1448300332 +0000
committer android-build-merger <android-build-merger@google.com> 1448300332 +0000

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

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