OSDN Git Service

Merge "Shorter notification text on AoD" into oc-mr1-dev am: 371ed39c93
authorLucas Dupin <dupin@google.com>
Tue, 26 Sep 2017 23:05:27 +0000 (23:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 23:05:27 +0000 (23:05 +0000)
am: a8a75999b9

Change-Id: I6498ccf96fdf3480d14ac9bb671084ed4d0f27d1


Trivial merge