tree 720a632db04812a6c5422c68b70ff6957e31c600
parent 9a036229277479c0bc53d850ed5c98b8b69aa080
parent f3e18606f77c9e88b6882e4e344059320f9ebea5
author Geoff Mendal <mendal@google.com> 1426510219 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426510220 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev