tree 71699c7e54d90a119df4039851804ffc096bf570
parent b8d49cd3dc49a4a67c16f85c9277ab22007c0c9f
parent 18b990d62e3537089a301f93af474e374b4a150f
author Geoff Mendal <mendal@google.com> 1446137270 +0000
committer android-build-merger <android-build-merger@google.com> 1446137270 +0000

am a1d6b6b7: (-s ours) am f7b7ef98: (-s ours) Import translations. DO NOT MERGE
am: 18b990d62e  -s ours

* commit '18b990d62e3537089a301f93af474e374b4a150f':