Merge "Fixed enableLocationUpdates crash" am: 663db0d09b am: 66b6faeae1
authorJack Yu <jackyu@google.com>
Tue, 7 Mar 2017 01:05:35 +0000 (01:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Mar 2017 01:05:35 +0000 (01:05 +0000)
commit89af85683702e7ba36310ad2cc685bf4b94416c0
treedad1739fcc7a5d3f844a1f59201c01fa973e9f0a
parent8d2d42a52c443d3a71992147d0cd7e3819a1f0c6
parente243c82c689089288c0d7f38f3ed194c29dab026
Merge "Fixed enableLocationUpdates crash" am: 663db0d09b am: 66b6faeae1
am: e243c82c68

Change-Id: I28c7194f55cd01c6bbd11b5d2038d08b86e47f51
src/java/com/android/internal/telephony/ServiceStateTracker.java
tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java