Skip to content
Commit 7b4458b6 authored by shawnlin's avatar shawnlin Committed by android-build-merger
Browse files

[automerger skipped] Merge "[DO NOT MERGE] Remove the server side flag of... 

[automerger skipped] Merge "[DO NOT MERGE] Remove the server side flag of clockface blacklist" into qt-r1-dev
am: 59c53a10 -s ours
am skip reason: change_id I7aa2c2deb690a3c8a5648754eeb6ae10ed0af0d8 with SHA1 9e89ef2a is in history

Change-Id: I8f37b26a136b66eb0d00d92c8aef82962291e36f
parents ed784a72 59c53a10
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