tree d237d9246e1f9b963d1981f8a951dbae23f8a104
parent 4b7a66a8b9328f19f77eecc62c124abe3a8d94a9
parent 5b74836e30ffd3c7aa0175b40c3991e0f995ced2
author Geoff Mendal <mendal@google.com> 1417668713 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417668713 +0000

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