tree f1ac1a19bbfabc619c769b52d82594e5a581dbb0
parent a4988d0977f3e31a49c36812485c30fadc11780d
parent 81e3b48f9c63760b1a772b50e6df89b89ccce779
author Adrian Roos <roosa@google.com> 1502110941 +0000
committer android-build-merger <android-build-merger@google.com> 1502110941 +0000

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am: 81e3b48f9c

Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00