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

[automerger skipped] Merge "Dynamically allocate objects in TelephonyRegistry... 

[automerger skipped] Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" am: de5e074e am: 9e63a140
am: 3dd27a29 -s ours
am skip reason: change_id Iec56cc99f9e702ebdbbdd78ad5362de0ff4e3ff2 with SHA1 5d354610 is in history

Change-Id: I9d99d5ec5cd2c70598168e41f2cb1da2c5f20500
parents 8adec1b5 3dd27a29
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