Skip to content
Commit 0ef47fcf authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-9807f04232de4d5bbe057b52760abf83" into qt-dev-plus-aosp 

* changes:
  [automerger skipped] Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2. am: 6b93ec01 -s ours am skip reason: change_id I079018679766738a97b827bc87a6903655f308dd with SHA1 791dd865 is in history
  [automerger skipped] Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev am: 1447fd97 -s ours am skip reason: change_id I9b9a51dc5dc06c90229fb36c34c24258991c4146 with SHA1 76985bd9 is in history
parents b98e968b 0e221048
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment