tree 482d11f331291bf386aa2b0c683ea1bf523f9df0
parent b6212537de42f9542b7e3262dc8662440d2af0db
parent 3d96fac421fe7e81a520f31b2bf2128ac2e0e0eb
author Geoff Mendal <mendal@google.com> 1450274063 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450274063 +0000

Merge "Import translations. DO NOT MERGE"