| commit | 7d4c07d1d522a5b644555a93dcca842824a26291 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 08:29:46 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:29:46 2021 +0000 |
| tree | d3f5fca1312986af0f2c6e9136f6e8c0f3f192f8 | |
| parent | e1870a6d9a9dac7bf12279a902c62382eb004f28 [diff] | |
| parent | 319fb06799864d22f5d05bdd3046f345c0efb3f3 [diff] |
[automerger skipped] Merge Android 12 am: ce8144a33e -s ours am: 9fc901b8d6 -s ours am: bcceea173f -s ours am: 319fb06799 -s ours am skip reason: Merged-In Ia0563707c50e37047031f278c89f590eeff2c1cc with SHA-1 82acd5f945 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/1847706 Change-Id: Ic91bf180eed60c6e1e9cf25c167ef212a1d3a9ea