tree 7afe2e81d8a93c8014688a2d531e1bfcb5805bfb
parent 2f2af39911976974177e92099e27c10fe93beddd
parent 30e434a996e0053eeeeb41f6a198f3945055445b
author Julia Reynolds <juliacr@google.com> 1464902074 +0000
committer android-build-merger <android-build-merger@google.com> 1464902074 +0000

Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e