tree 774ebaa2d5c19735e0b1340f0639eae15eb25e5b
parent 5101473303abecc5c0d6b3538cf81ffe9336461c
parent ca854cc2b949ea9ce3c979ab9b0d88fe21230bfb
author Jordan Liu <jminjie@google.com> 1539292375 -0700
committer android-build-merger <android-build-merger@google.com> 1539292375 -0700

Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa
am: ca854cc2b9

Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a