tree a8934165493837d038d89cadf36291b1e4a5bac6
parent 624190b5cd6e557209fb8f20b3efa48650aa5076
parent 629232b794272a484e94b3ba0991fcad7a420b74
author Tyler Gunn <tgunn@google.com> 1528218122 -0700
committer android-build-merger <android-build-merger@google.com> 1528218122 -0700

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

Change-Id: Iea4b84e590c2f251b2de3a64eba59e41d638c874