commit | 45753d1bbbda91bd1ad429edbcbb05fbcf3a1578 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Thu Sep 01 03:09:33 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 01 03:09:33 2022 +0000 |
tree | 8f4fe256a8d461e7ff760662b77cd1a5540d839b | |
parent | 10e9c1355fe519dbc9a228e7711074a38073c620 [diff] | |
parent | 09e7a52d836711f31b61be3f5a20e9f8665affbc [diff] |
[automerger skipped] Merge "Remove unnecessary java_language property" am: 50c9d7db09 am: d46ebd49e3 am: 33d203760b am: 3aabcbea25 am: 09e7a52d83 -s ours am skip reason: Merged-In If479dafb0fd813b301c985c74f7076a6796aa004 with SHA-1 10e9c1355f is already in history Original change: https://android-review.googlesource.com/c/platform/external/okio/+/2174742 Change-Id: Ib243957dc4c8a082b2897afa95f73cf36e8054c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>