summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 08:30:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 08:30:10 +0000
commitcd9afb673ed5c672a885221f5d1f95740a96fc6e (patch)
treec9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
parentbdfd9b4a76260ee66cd5ea7618bfd53fb9a2fc67 (diff)
parent49668fcb0ef575e365e3bc83f8c92a1d4d8e2859 (diff)
downloadvoip-cd9afb673ed5c672a885221f5d1f95740a96fc6e.tar.gz
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours
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: I853dd4d059492ffaac61ef4fd9c8ed0143ecb284
0 files changed, 0 insertions, 0 deletions