| commit | 16cecedbd39916340aa7676c0a83fc0415e53d1a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:39 2021 +0000 |
| tree | 766ef423e8f021e0722776b1d031d9dd4529653f | |
| parent | 8844864238682f0bc658ff2c18d552f804d24f91 [diff] | |
| parent | 9c6f5b4693308f64e66a0f7d6322a601447d6140 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 4b95116a89 -s ours am: 7fb9539e2d -s ours am: c76ccebfed -s ours am: ac7a67a456 -s ours am: 9c6f5b4693 -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: I629f83ecd8cc652dade1c3b9f8e790ff9b539555