tree 07b59436975b1d8b523fbb33b6d0eca53c0b78cb
parent b531762c89e45b9ac5c401a2e90f9330bcdf629e
parent 1a3c88a5bf8c80d46958830bb6282463c72a4e6b
author Nathan Harold <nharold@google.com> 1445480034 +0000
committer android-build-merger <android-build-merger@google.com> 1445480034 +0000

Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f
am: 1a3c88a5bf

* commit '1a3c88a5bf8c80d46958830bb6282463c72a4e6b':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()