Skip to content
Commit b5b81ee3 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

[automerger skipped] Merge "Merge "Remove unused setting" into qt-r1-dev am:... 

[automerger skipped] Merge "Merge "Remove unused setting" into qt-r1-dev am: 95a675ce am: 709b0a4a" into qt-qpr1-dev-plus-aosp
am: 2300a4ec -s ours
am skip reason: change_id I5c4af200b0c61efb9a0f76d00c2f047d4880d77b with SHA1 d806bc4c is in history

Change-Id: I60b01b00ac68a888d8dca0a76b97b1ce59bde5df
parents 3dc631cf 2300a4ec
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