tree 96a66b32ad2dabdda1a0d53c986332016c155d35
parent 3ebbdd03ea47480c951746c994fd3332edff9b4d
parent 032492572e8217ccae6986383a1abbec4684c560
author Geoff Mendal <mendal@google.com> 1428497719 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428497720 +0000

Merge "Import translations. DO NOT MERGE"