tree b91a3628d9702981bb96c218959034734da147bd
parent 11631e7fa971bc3dca385d18455e5cb764e59bfa
parent 5a50cb42b7e22ded08047524464fa360647b2785
author Vishnu Nair <vishnun@google.com> 1550616996 -0800
committer android-build-merger <android-build-merger@google.com> 1550616996 -0800

Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
am: 5a50cb42b7

Change-Id: I60169422c51d12b19bb24e997ec9a2a98fffa2ea