diff options
author | Griff Hazen <griff@google.com> | 2014-05-05 22:53:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 22:53:59 +0000 |
commit | 23fccdd0b510f3045362e69b984d94d4773d6f5c (patch) | |
tree | 8b5cb76462f436cbb801206ca1575f82403773ef /core/java/android/bluetooth | |
parent | d56eff3812eba6369f1a6439ca793d46dcb66fb7 (diff) | |
parent | 36ef0792d28d2beb8eecb4547fab81d520c66ed0 (diff) | |
download | frameworks_base-23fccdd0b510f3045362e69b984d94d4773d6f5c.zip frameworks_base-23fccdd0b510f3045362e69b984d94d4773d6f5c.tar.gz frameworks_base-23fccdd0b510f3045362e69b984d94d4773d6f5c.tar.bz2 |
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)
Diffstat (limited to 'core/java/android/bluetooth')
0 files changed, 0 insertions, 0 deletions