tree b2b2cea9d9a6a8167281be57016f06a69aa69a39
parent 5510a437f2c274750a293b09049ca4c775dcd929
parent 1cfc200aea5076da71391bd8ebbef74584ac62ab
author Ian Lake <ilake@google.com> 1498771773 +0000
committer android-build-merger <android-build-merger@google.com> 1498771773 +0000

Merge "Deprecate v7 NotificationCompat.Builder" into oc-support-26.0-dev
am: 1cfc200aea

Change-Id: I01866a306577325ce3043447ed678a2128097438