summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-03-24 16:00:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-24 16:00:43 -0700
commit09a6d47b846ad6b7bc5642021305ae4cd324ea46 (patch)
treeeefb418738b9bd085c00e996cc51ebab8d38eb73
parentb09249f9144af8c99db7848f92164752e72fda4d (diff)
parent66c49bc99d3e33c00c3f674fca9cba06d1abc199 (diff)
downloadframeworks_base-09a6d47b846ad6b7bc5642021305ae4cd324ea46.zip
frameworks_base-09a6d47b846ad6b7bc5642021305ae4cd324ea46.tar.gz
frameworks_base-09a6d47b846ad6b7bc5642021305ae4cd324ea46.tar.bz2
am 66c49bc9: am c3b7a671: (-s ours) am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '66c49bc99d3e33c00c3f674fca9cba06d1abc199': Unhide Notification kind, rename to category.
0 files changed, 0 insertions, 0 deletions