tree 5b55fb4d48cc5a1698ff2b0e1b4197dec6fced9a
parent fa8d52fef4e0bf3d7c68f8db9ae8c87f0d312250
parent 5d2a778149e25d663a0ba1eb3389431b2680755f
author Geoff Mendal <mendal@google.com> 1420656373 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1420656375 +0000

Merge "Import translations. DO NOT MERGE"