tree 86312e2ea0df9a4d4cd0e1bb240cb39513b68d47
parent 47da8197b17c4b63934b2c1a12b50360da169f69
parent 41de81ea75d57aa277a3dbf57a1d4824fda24bf7
author Julia Reynolds <juliacr@google.com> 1492105255 +0000
committer android-build-merger <android-build-merger@google.com> 1492105255 +0000

Merge "Allow notification channels to be silent." into oc-dev am: d178ec489f
am: 41de81ea75

Change-Id: Ie1d34910cdbd1d534296dd848baa3af8b181357a