tree fdff6fabce2db64f7ea7df6874a4d3e5e5a58280
parent dcf080d571e9b40266a961ddd1a421efecdded1a
parent 5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8
author Justin Koh <justinkoh@google.com> 1400021150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400021150 +0000

am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev

* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
  Hide new methods in notificationlistenerservice DO NOT MERGE