tree af1053840adb5ec807f3097f6570b7f01e0a06e9
parent 6f775a8d0f6db07705edb21e2675b02aa5c184bb
parent dd77586fbe6a9938dfaaeaaf4852c575fe06f1ff
author Geoff Mendal <mendal@google.com> 1449680423 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449680423 +0000

Merge "Import translations. DO NOT MERGE"