tree 7e462dc70b52d363cf5047a8e6dae7e4da0456fe
parent 10794f0b5f27080cc7e3a83ce200b900d628a270
parent fbe4ba4fc96d46a1d1366eb2f6aefc220945c7a5
author Geoff Mendal <mendal@google.com> 1446240671 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446240671 +0000

Merge "Import translations. DO NOT MERGE"