Skip to content
Commit 6f006f0d authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add CAPABILITY_EMERGENCY_PREFERRED in... 

[automerger skipped] Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" am: 5b5889fc -s ours
am: e0237019 -s ours
am skip reason: change_id If70d917cfb3d825f375d282012b8788d69a2f144 with SHA1 499881f1 is in history

Change-Id: Ie5896d6f3dfa313574d65681131d00f6bb16e6b3
parents 0df74430 e0237019
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