commit | c2c0535871150c005a5257b94123c16e26a61692 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Oct 25 06:40:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 06:40:20 2016 +0000 |
tree | fe028c7125d69a84fcc6fdcfd46aa99a08bb6b46 | |
parent | 0a4d0a1905c4180af315f8430385396743ab34ee [diff] | |
parent | d230d7d15d7bb68d3657f119f9f16735d55f3739 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: a0980e58e4 -s ours" into nyc-mr2-dev am: d230d7d15d -s ours Change-Id: Icde90b1f0b61ae5b331307b26b5b7ff1836f9022