tree d28fe074dc6350aad2b3173ea960179313fbb330
parent 0d851ef59775102272869e7afd727c45f13d14b5
parent d36d67445ce8b493600ff8577dc9c0738bf33259
author Geoff Mendal <mendal@google.com> 1448287213 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1448287213 +0000

Merge "Import translations. DO NOT MERGE"