Skip to content
Commit c87412fd authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

[automerger skipped] Merge "Don't start intelligence services that are not... 

[automerger skipped] Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev am: 4e807089
am: b27cd42b -s ours
am skip reason: change_id I07f9873a7ad0c6dd1c1a0d6a0e5e05681bfc67fc with SHA1 c6fff252 is in history

Change-Id: I7c919bf1bc1720e44487ca87cb83786ca2a109d8
parents bd5453c2 b27cd42b
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