OSDN Git Service

Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev
authorDaniel Sandler <dsandler@android.com>
Mon, 19 Dec 2016 16:50:18 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Dec 2016 16:50:18 +0000 (16:50 +0000)
am: be09dd77dc

Change-Id: I9dd8c496cb6e9fec63ba370d25faedbcd505dd13


Trivial merge