tree 392558c3b248474785b38b9a228787bd722fbbdc
parent e0a88629e11e65c87c9b9675a4be4cccbc4e89ee
parent 19a81a616f3b70510e557caaeaf3cae4ec1356ad
author Christoph Studer <chstuder@google.com> 1401279194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401279194 +0000

am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev

* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
  NoMan: Don't unbind system listeners