tree b7e2c04c603fec99b029dc78729c5501b53855b0
parent f2048779990bfd3c20b52149f5e8ab208bf2502a
parent 917a33eb1a8f9493bd486684e1866eb5dda8dacf
author Geoff Mendal <mendal@google.com> 1417670881 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417670882 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-queens