| commit | bbb721d71f4b283ee9f144368ea82e33b75afe2b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 06 02:20:11 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 06 02:20:11 2018 +0000 |
| tree | 24149efc78d3b4a70692bbc719ae5662ba49693c | |
| parent | fc22a5cae0606a236edc23f9f6437345d71e9b3a [diff] | |
| parent | 6c30932089dfefe5d01862af70dde3bbea9a0414 [diff] |
Merge "Avoid trademarks." am: a70089163c am: 6c30932089 Change-Id: If54b88284fff7f6993cfd71c492b50dc2da24056