Skip to content
Commit f8b34236 authored by Edgar Wang's avatar Edgar Wang Committed by android-build-merger
Browse files

[automerger skipped] Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev am: d76cc783 

am: 434b36ec -s ours
am skip reason: change_id Ied7d97d4b4b0955981824d7342aabe74d06a0c1f with SHA1 6cb2feea is in history

Change-Id: I0edceda48793dd903f2e06edaac358d8c15377f7
parents e1b52c09 434b36ec
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