tree e8923409985d243eb762d36fcb4b7f212ae67ea0
parent d7f2dffb388abab12524b2dc0fa44ae1e19bc78b
parent 1f1e67488955b9a6b17a8dce32cea29afcbdb1c7
author Steven Moreland <smoreland@google.com> 1485466480 +0000
committer android-build-merger <android-build-merger@google.com> 1485466480 +0000

Don't crash on listener registrations. am: 30acc22dac am: 0266bfae9b
am: 1f1e674889

Change-Id: I4a7d34aaf168983b52025508a002852345106799