Skip to content
Commit 388295e9 authored by Mark Chien's avatar Mark Chien Committed by android-build-merger
Browse files

[automerger skipped] Merge "Fix the race between entitlement start/stop" into qt-r1-dev 

am: 5d6e9877 -s ours
am skip reason: change_id I63f858356b4543b5bdda41d03e45adc944b86da3 with SHA1 4f95975c is in history

Change-Id: Ia4c2a0f1e330916e0f841301ff35b81e04d88054
parents 00de76a6 5d6e9877
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