| commit | 42495caa3afa87b9bf87eb855da2b0e2d4247526 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Thu Oct 22 18:02:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 22 18:02:04 2020 +0000 |
| tree | 6ac0d69404f90ca1d22a01caa566e328dae8e54f | |
| parent | 87386ad9d2c8528f5ea7aa9409ece6bb9e59eba8 [diff] | |
| parent | 4e8152bdc5c826caf2ff682ff2cbd6b5893c896e [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 4e8152bdc5 Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1469642 Change-Id: Ifcf05716bae476431b7e7e451bee424399e7beda