OSDN Git Service

Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d...
authorAndrew Sapperstein <asapperstein@google.com>
Thu, 27 Jul 2017 05:44:26 +0000 (05:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 05:44:26 +0000 (05:44 +0000)
am: 97ca7e473a  -s ours

Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b


Trivial merge