tree 0955db3e277ac1f0d1eb0bb82c9e04a54dd2e8d1
parent da72cb368ed4a04115154d1897fcb51fabe7ca3f
parent 36dbd3d43ffc0372227c6e5bd51c52cd5a04bb14
author Andrii Kulian <akulian@google.com> 1498702603 +0000
committer android-build-merger <android-build-merger@google.com> 1498702603 +0000

Merge "Further restrict activity launch on virtual displays" into oc-dev
am: 36dbd3d43f

Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e