tree 0aa8ea55cbf6ed37886b07ce3e1b2222e817a913
parent 5694f4f2eb3582b8113f46c3d895e4c21dfa7070
parent aa1fe922e438f66618ea81dc2e5b4134cc099295
author Geoff Mendal <mendal@google.com> 1438174107 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438174107 +0000

Merge "Import translations. DO NOT MERGE"