tree bff2f694b02976ec77488d184517800935a70592
parent c0c73271b0034ba20b1b73cb633c99a86c504a01
parent 66e7f006cf16e3b863bc22f941585e34067c5bdf
author Geoff Mendal <mendal@google.com> 1448298836 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1448298836 +0000

Merge "Import translations. DO NOT MERGE"