Skip to content
Commit d0c24ded authored by Miranda Kephart's avatar Miranda Kephart Committed by android-build-merger
Browse files

[automerger skipped] Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev 

am: 724b3637 -s ours
am skip reason: change_id I5a0abda9ff5f85ceaaa20d3e145a207add7a4b53 with SHA1 9299eb3c is in history

Change-Id: I0bfc29482d7ab4658d4e897b77e0aba04b45c9e2
parents d85fdec2 724b3637
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