tree b310264b97126977a6ab01e74cb5730a1ec3bf40
parent e558f21f30336ce970b5ae96fbc54a6e270abea2
parent 0870da759fe836aae5201acab14bf5371b986ad1
author Adrian Roos <roosa@google.com> 1502114071 +0000
committer android-build-merger <android-build-merger@google.com> 1502114071 +0000

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee
am: 0870da759f

Change-Id: Iffbd44676b0c4157b040b215d35a5359c6acc509