am 3c93767b: Merge "Revise CellInfo API\'s"

* commit '3c93767bab0040818e0f530c0d0102654a87e0c0':
  Revise CellInfo API's
am d4ed2bde: am eca0fe06: am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit 'd4ed2bdefb663ee7cb78c25edba4f8a70fe31c29':
am a2aa7a99: am 89ab794f: am 9fdeecb4: Fix build

* commit 'a2aa7a99068ce4cb7d7a72450aa05d10884ad307':
am 64159c62: am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '64159c6230faabfee86bbb9597a04d202034882b':
am 067196df: am 522ff6be: am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit '067196df27214e8203369b013023887919a10aff':
am a6b55dcb: am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit 'a6b55dcb21ebc8e781d3031ff2de74e23427abb1':
Telephony: Look for CSS indicator for voice+data

For non-LTE, use the CSS field of VOICE_REGISTRATION_STATE to determine
if the modem supports simultaneous voice+data.

Change-Id: I546c939f325a6e3b09d563e32d45412910401422
am 06e85d33: am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '06e85d3327fcdd6b2a8e7b83c9f84f0ae348a12e':
  Add DORMANT state to GSM data link activity
am 28af7786: am 073517d3: am d016bfd4: Merge "fixes buffer overflow for data"

* commit '28af7786dc807b6647221bfd2c0edd4fdbffef3c':
  fixes buffer overflow for data
am b89bb0f8: am f7c060b9: am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit 'b89bb0f88d5e1042a5fa56b6b1dd4baeec07f58f':
  Telephony: Move AdnRecord.aidl into opt/telephony
am b754042d: Merge "Fix a logging NPE problem" into jb-mr1-dev

* commit 'b754042d27e77f6e800b2e9a16d9b3ee9f91f154':
  Fix a logging NPE problem
Telephony: Check SmsTracker's mSentIntent for null

When SmsManager's sendMultipartTextMessage is invoked with null sentIntents,
the SmsTracker object is initialized with mSentIntent as null.
This causes NullPointerException.

Change-Id: I545c4a23676ba67f6a5523f15564993f001e48ca
am 049ab042: Merge commit \'e0e2ebb5\' into fix-merge-conflict

* commit '049ab0421f32e6effc5d1277b69bd382cebadb18':
  Telephony: Dynamically instantiate IccCard
am 04e862d1: Merge "do not build mockril for PDK" into jb-mr1-dev

* commit '04e862d1a81386dbdc995bde6451456016765ed5':
  do not build mockril for PDK
am 7717d50e: am 3bbdedb2: Merge commit \'10b02a84\' into fix-merge-conflict

* commit '7717d50e4bd32cdee17bc87dc80b30c9d51a59d4':
  Telephony: Dynamically instantiate IccCard
am 59a96dd3: am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '59a96dd369b5c275b5e40105d71ed4c76d46f8b1':
  Telephony: Fix npe due to mIccCard not being created
am e0e2ceb1: Merge commit \'616b281b\' into merge-conflict-TelephonySignal-Strength-cleanup

* commit 'e0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4':
  Telephony: Signal Strength cleanup
Telephony: Don't ack CB messages

SmsDispatcher receives its own broadcast to ack messages.
CB message needs to be excluded from the acking code since
it should not be acked.

Change-Id: I3f1496bb0c81a8edcc4173661e2ca75b03a9c6fb
Telephony: Fix decodeCallbackNumber for Cdma CMAS

Fix exception in decodeCallbackNumber for Cdma CMAS by
verifying expected param size.

Change-Id: I687a0ad424b6c1d73c0320b3a776cadf7e8ba180
am 81a055a7: am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '81a055a7b9e3049413a503fa61c09f3f43648d78':
  Telephony: Always create IccCard