commit | cfcd2770225f28d96416aaffeae2e300d38ba68f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:27:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:27:31 2016 +0000 |
tree | 07c368c9f71bd65c328b0c9f9bcbce133030a6fb | |
parent | 14bd1b3c7c4fa026e4c0c86c5809ea8446280697 [diff] | |
parent | 630fac14b848bd080ed18dc68e45e23f0f1108ad [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d -s ours am: 630fac14b8 -s ours Change-Id: I1df41a9ac5d9cf4b8674c4f9ade533764fc7a0b4