OSDN Git Service

Merge "Add ambient notifications as inline setting." into oc-mr1-dev
authorAndrew Sapperstein <asapperstein@google.com>
Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)
commit8f25bc916a79b666ffcedc8f8ec0caa52fbc6649
tree1835195f4771e53ddb6952a57e65b1aad09c6f0c
parent06a9a033a051ec26f5276b8b4af520acb7407fc1
parent5d7fab4f22ef3df78dce88c3a7a60285a89f7e9b
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am: 5d7fab4f22

Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef