Skip to content
Commit a42aeea7 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Freeze... 

Merge "[automerger skipped] Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2." into qt-dev am: 9c0f0db7 -s ours
am: a3d5b22a -s ours
am skip reason: change_id I079018679766738a97b827bc87a6903655f308dd with SHA1 791dd865 is in history

Change-Id: I83ac0d7a838a05b0fb5209657d4434881e23d0ab
parents c3054076 a3d5b22a
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