tree ed7a1b54ba3c17b86707b74d4c5283848181f369
parent 319cc0ce10fee88ba6312116541c8dfae4ad7070
parent 3ca63ce0a8d10760f072fe87e861bb8a37b09bd3
author Geoff Mendal <mendal@google.com> 1439987680 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439987680 +0000

Merge "Import translations. DO NOT MERGE"