tree ab2ed1ac73b5c7cbe56574d87e7b072293501d07
parent 5f79e64eae77f8a0a06a0d07b754e40f6beebd48
parent 0eff354771646bdd26cb211a590ca806865afa9a
author Malcolm Chen <refuhoo@google.com> 1514410352 +0000
committer android-build-merger <android-build-merger@google.com> 1514410352 +0000

Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8 am: c7cebc8e8e
am: 0eff354771  -s ours

Change-Id: Idfb1d9169e05461bf534babfde9c991c479a58e8