| commit | e46060c4528226af1a1089a123a21e537544aaa0 | [log] [tgz] |
|---|---|---|
| author | Florian Mayer <fmayer@google.com> | Mon Feb 22 11:47:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 22 11:47:53 2021 +0000 |
| tree | 4982cee1e7b8328276575d8fbba75028856bafea | |
| parent | 1c3cce4627b1b3fed22ec3a07e36f7291a5f4a7a [diff] | |
| parent | 340c0ad3a4001bc2c52503277119a366c534ebb1 [diff] |
Merge "Revert "Merge branch 'upstream-master'"" am: 340c0ad3a4 Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1598216 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12c7a288713fcd0aa0ab3df0879a8fa0782ed4d7