tree c1782c490388d7dc376fe30371e36c11b6c62e24
parent 96671ef54437f415981526dce08ca51e268fc7b5
parent 37e1a3928bf28a48baa05e34250b1e5665f68277
author Tyler Gunn <tgunn@google.com> 1528218363 -0700
committer android-build-merger <android-build-merger@google.com> 1528218363 -0700

Merge "Fix potential NPE in EmergencyCallbackModeExitDialog." into oc-dev am: 629232b794
am: 37e1a3928b

Change-Id: I0697460e3bee85cc86845e5d02e905c594a0c102