commit | 60570b3cc252ad887784f5ebf44947e74e5c2bcc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Apr 02 08:59:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 02 08:59:14 2017 +0000 |
tree | be7a9c7e385729baac1f177141725fd02e9d4529 | |
parent | 5cadf2be8e87cefe9a71ee62cc4e773c12e653aa [diff] | |
parent | 4fd00b9756ca575a512cd1243f56b7cbb77322f4 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f13c6c2a4c -s ours am: 4fd00b9756 -s ours Change-Id: Ia7246f6e66ba1e7931aa7dd88f65408e9c3973f8