Skip to content
Commit 58410ee2 authored by Aaron Huang's avatar Aaron Huang Committed by android-build-merger
Browse files

[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

Change-Id: Ie1cdb9a928f97681ab4083b68db3fd453b0399e5
parents 67350795 1447fd97
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