commit | bbeb9bebeb249866463cb1887ed340ffb5b5d888 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 15:33:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 15:33:47 2017 +0000 |
tree | a57d407edf1378e3302f922fb1391d8f42c70683 | |
parent | 5751b9fbefd19429741f1933c2885551a494af7c [diff] | |
parent | cdb756273d50b99c87d29e603e1a0809f5d8bf68 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 64465df428 -s ours am: cdb756273d -s ours Change-Id: I2b541eccb57f49daf56c6f35c7ae1f0eb1559552