tree fdf375c3897ae326231c2e9badc437da8cc3e5ff
parent c890637d82cbc9493396110dc23f0e71068a5618
parent 0ef51ec3dd0e65b7e8e45c89957d23c5b81eba19
author Geoff Mendal <mendal@google.com> 1426511408 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426511409 +0000

Merge "Import translations. DO NOT MERGE"