Skip to content
Commit 1231ca4d authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

[automerger skipped] Merge "Remove isActivePhoneId as it's moved to...

[automerger skipped] Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96 am: fd5d074f am: 914861c2
am: 281e4ef4 -s ours
am skip reason: change_id Idf7babd3ad0bcbde04b2a92761acf31ec9776a50 with SHA1 afe7d799 is in history

Change-Id: If754c862285ca90483c3beb7fd0d5bbb9ff55cde
parents 6d041cbe 281e4ef4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment