Merge "Track the calling user id in SmsTracker"
authorTony Mak <tonymak@google.com>
Wed, 15 Mar 2017 17:09:38 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 17:09:38 +0000 (17:09 +0000)
commit980f5b85dcb226b6a5cc2e1f8f49691ea20738df
tree7ce376370716bf8a9bcefdde8eed4c0d6aa56f9c
parent6d4244906f6e902de4ab4cd12a7f21df54bcab6d
parent9fb0d53bab3ed7355cfbe2937d9b0aa89c224ce9
Merge "Track the calling user id in SmsTracker"
am: 9fb0d53bab

Change-Id: Ib74b7f0cebc21841c6bf2ab08a0a9a3a0eec0c9d
tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java