diff options
| author | Joseph Jang <josephjang@google.com> | 2021-06-07 09:48:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-07 09:48:28 +0000 |
| commit | 42c9a8b6aaece2868a7f23c36278f7a51f856778 (patch) | |
| tree | f7819440046e4556adeb2aa7070035cb19c2b962 /libnos/include | |
| parent | a3c75e241f28b143d8c3048cfe4b6e0842e30a17 (diff) | |
| parent | 5ade74dfdbd8d76d2c53a7b715f870a332cb50c0 (diff) | |
| download | generic-42c9a8b6aaece2868a7f23c36278f7a51f856778.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into into D2-SC-023 and MP-SC-02 am: 5ade74dfdbandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/14753975
Change-Id: Ie066c1dd44148319c212b35eeb957f2d9c2c97e5
Diffstat (limited to 'libnos/include')
0 files changed, 0 insertions, 0 deletions