tree 6cd872ba9e18649764fe9a10bff195e2feb34ee4
parent fdefd0496e901db21eefa5bdc9f2f82b2d85cde7
parent 23f2301b01592d342e800e5bd4ea5168eddc971f
author Geoff Mendal <mendal@google.com> 1446645836 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446645836 +0000

Merge "Import translations. DO NOT MERGE"