summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 07:57:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 07:57:12 +0000
commit49668fcb0ef575e365e3bc83f8c92a1d4d8e2859 (patch)
treec9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
parentdf427d2297b3ce6124cccdaac6989bdbffc477cc (diff)
parentb3aa668458c80aa36c1ba759192d7ad2b874beaf (diff)
downloadvoip-49668fcb0ef575e365e3bc83f8c92a1d4d8e2859.tar.gz
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s oursandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I8f7b5f08864b631733d38a880cd2b87d6b8258d7
0 files changed, 0 insertions, 0 deletions