tree f93d70f4ec32de20a5a5bb8f0b65298bc64fb591
parent 026a47a84ea031eab8b2a7cae8ca6fc1e3d478a2
parent a9f0885b7f1e422335e91c776e15e7ae9b2b3ffd
author Tyler Gunn <tgunn@google.com> 1496449522 +0000
committer android-build-merger <android-build-merger@google.com> 1496449522 +0000

Merge "Fix NullPointerException in supp service notify handler." into oc-dev
am: a9f0885b7f  -s ours

Change-Id: I77f36348776bbf604efc3ada27d0b3ab448bff94