tree 09aeba7deb6c25d930962629af0ed23eefdb62a3
parent 50705219567319eb7e7a8d4c01a33a8112913bec
parent bad8e2e37c89fa99031838f8f40f6cf52a42deb3
author Julia Reynolds <juliacr@google.com> 1464902704 +0000
committer android-build-merger <android-build-merger@google.com> 1464902704 +0000

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

* commit 'bad8e2e37c89fa99031838f8f40f6cf52a42deb3':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Iac59386fdb878007462c7a6a24770341d1db8914