| commit | ac7a67a45632d61ce6f2aee9fe7774edee4cfc21 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 07:56:31 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 07:56:31 2021 +0000 |
| tree | 766ef423e8f021e0722776b1d031d9dd4529653f | |
| parent | 38b0089bdeb7893fdeec22ae53fc0d6250c1b181 [diff] | |
| parent | c76ccebfedf66cd4af7123676513ccc3ac6d3454 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: 7fb9539e2d -s ours am: c76ccebfed -s ours am skip reason: Merged-In I91645ac90b6665bcbd9b2169eda92a067e83add3 with SHA-1 8e24c2413b is already in history Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1847349 Change-Id: I90809f0eefd3ee9c739004a2ea21ae7a4141d751