tree 49c317e6136ba5aef50849fc201060e120256674
parent 06ee120b0504a7809e68dd28ccba1ff72b301e53
parent c3f2df9d6b8eb22e5a112420ecfe0b55d8f5d585
author Jordan Liu <jminjie@google.com> 1539293475 -0700
committer android-build-merger <android-build-merger@google.com> 1539293475 -0700

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

Change-Id: I66da4d1ff190243205f89c2d4e08b4506df4a40d