OSDN Git Service

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

Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83