tree 86a737e80e11c0599b2bbc32c04fad57457cf5aa
parent fce533199fd960bad417719a1a618d007f6d159a
parent 921acf9ad5c11d20616ff72ea6d9ff19ed9a4e97
author Malcolm Chen <refuhoo@google.com> 1501636120 +0000
committer android-build-merger <android-build-merger@google.com> 1501636120 +0000

Merge "Make sure to unregister PhoneChangeReceiver." into oc-mr1-dev
am: 921acf9ad5

Change-Id: I8b0f38b983a6b63a3682358daf98110313527a5c