tree 7a3793b7d7f1007e5e89fad2b3423a1b99340b73
parent f120fe4112aa81af4c535fa0a0e4ddd928b1939a
parent 3b0d0a6bd3efb78ffdedb1b6cf67f75485455637
author Geoff Mendal <mendal@google.com> 1389823505 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389823506 +0000

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