tree 33098bb04846e17ff6ee95c4d7a724f353c29563
parent 04c69f7284a3ea8a95bd8fe797f58e3250010e16
parent e558f21f30336ce970b5ae96fbc54a6e270abea2
author Adrian Roos <roosa@google.com> 1502111712 +0000
committer android-build-merger <android-build-merger@google.com> 1502111712 +0000

Merge "Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c am: 7a1bc55d78" into oc-mr1-dev-plus-aosp
am: e558f21f30

Change-Id: I1fa5ffc1cd43ca6ee35b2098f29531f3a9565f2f