Skip to content
Commit 45099295 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead... 

[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead of default value" am: 9e6f5d15 am: 109f4590
am: 8a95207b -s ours
am skip reason: change_id Ic40921679ade1f9be42f2bc3d5170ba201dbab5a with SHA1 1772247b is in history

Change-Id: Ieac24e725bae945aa0023fd72350612d5812c77a
parents 1f71a6a2 8a95207b
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