tree cdc056ca054acd1ff10a13325d6161a279a7c0db
parent 3819e278ba16b7cd5c38fcbf5433f03ca8cc562e
parent 402bd42c1886be885adc4d90d90dd573fc2f845b
author Bill Yi <byi@google.com> 1502126295 +0000
committer android-build-merger <android-build-merger@google.com> 1502126295 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 592b1d9ca4  -s ours am: 54b385d637  -s ours
am: 402bd42c18  -s ours

Change-Id: Ibbdb4da66e9f9cd659fc7f59441a84be42293de1