OSDN Git Service

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)
am: 81e3b48f9c

Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00


Trivial merge