tree d9246b7cf19aca4a623bbc42f728257260988834
parent 36377c7c19db8fed8d371a3cdc5985d808eaf88c
parent 5e5567d6ce471cd85ca4d1fc17f6d18a0c8fe52a
author Hall Liu <hallliu@google.com> 1517546273 +0000
committer android-build-merger <android-build-merger@google.com> 1517546273 +0000

Merge changes from topic "fix-telephony-registry-location" am: 7021ee581a
am: 5e5567d6ce

Change-Id: I751176d2cdea53a7e4e27249a1309ec5fed7bc76