tree 2aa1a404f6b7f328da67f049c55e87f7d4becfbe
parent 3d27be827b5146b4c9bc0dd0747c0f41c036fe3d
parent 0660fe8e268e22be1096c05ad8eca81d837989f1
author Geoff Mendal <mendal@google.com> 1450738497 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450738497 +0000

Merge "Import translations. DO NOT MERGE"