tree 8b5cb76462f436cbb801206ca1575f82403773ef
parent d56eff3812eba6369f1a6439ca793d46dcb66fb7
parent 36ef0792d28d2beb8eecb4547fab81d520c66ed0
author Griff Hazen <griff@google.com> 1399330439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399330439 +0000

am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)

* commit '36ef0792d28d2beb8eecb4547fab81d520c66ed0':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)