Skip to content
Commit 45d3f2fb authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Update setting to be bubbles not... 

[automerger skipped] Merge "DO NOT MERGE Update setting to be bubbles not badging" into qt-qpr1-dev am: 0afaedd5
am: 4b25085e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia743e2c0be3ceaed3eb0a1cfc0f50acb54751482
parents 7ab07e56 4b25085e
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