tree c6cdd0c1466b14e545c2ae3e14b753116a68b451
parent 8067dfef2e0cccd112b01303b98f140f8e6596ba
parent c12a2ed7feda51bccd30b719d563df0375f3da94
author Geoff Mendal <mendal@google.com> 1440858855 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1440858855 +0000

Merge "Import translations. DO NOT MERGE"