OSDN Git Service

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

Change-Id: I1d719ba5224081712ce4463215cfdcc980ed7749


Trivial merge