commit | 641a4708437738fdaa4ca4ff3df73b856c425984 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:16:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:16:11 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | 8fb0ffb4d09a98ee44c8cdb8f08a8af12f242f22 [diff] | |
parent | b712d61315dc108364bad8e9e0e49a67d835a73b [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5770cc3c21 -s ours am: b712d61315 -s ours Change-Id: Ia30f6cfcc7f7aa54ce3dab4e0f6cdbc75f75204f