| commit | c99ebf073e89f25fa1105cec713616a3483e4d20 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 08 09:59:23 2020 +0100 |
| committer | Anton Hansson <hansson@google.com> | Thu Sep 10 08:18:00 2020 +0000 |
| tree | d2bac13232a5bb59b912a0f6a72677453ed1c781 | |
| parent | 94d62a4097340693d5c747b408ca24a6e008e23e [diff] | |
| parent | 037fa19ce664f2a6ee02df714c6354a731c4cbde [diff] |
Merge mainline-prod into master $ git merge -s ours origin/mainline-prod There are only two commits not from upstream: 05cdb9972ac11770ab155b8b8e7fe61fcc168011 1be2664406a2e697044f483a44c547973f915e3d But both of these are noops in master (due to Merged-In). Bug: 168176832 Test: presubmit Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705