tree 0170c406b396cc9c5bb7df691c75eb34b106586a
parent 72594630e2aeef621659fd8a9b8d0b7b1f969e0a
parent dca2d45630db4905e7b353fff30f8b7dad76a10b
author cncn <cncn@google.com> 1574391107 -0800
committer android-build-merger <android-build-merger@google.com> 1574391107 -0800

Merge "Make Notification.Builder.SetFlag public" am: c8bd4aecb3
am: dca2d45630

Change-Id: I705e0967e993237d9f1ac2b276e66fab2422f098