| commit | 339d2b173f471e556442058bb080b905e434eafa | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 07:41:46 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 07:41:46 2018 -0700 |
| tree | a70235945948deff0968ff1af50a810795685572 | |
| parent | 808fd4dbc49bbf1a2ed99c46446ac0ea72159bf0 [diff] | |
| parent | 602a157812d52e63203b6e5b7b66df5c6a0a9022 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a66fdf51a9 -s ours am: 602a157812 -s ours Change-Id: I866dac5e3ccbc5dee840103690561eb4b63bc187