tree d7062e99d860ee61ceb1e97752ff27bc74462df5
parent 21b32c6bc3810e37a57aeae6321c1cc25f4b800a
parent 7e8a518266090e71f7fdad8c86f075ea28ea06fc
author Andrii Kulian <akulian@google.com> 1491617138 +0000
committer android-build-merger <android-build-merger@google.com> 1491617138 +0000

Merge "Enable FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS on phones and tablets" into oc-dev am: f49152330a
am: 7e8a518266

Change-Id: I701387ec8c656a5cd74a39631a16205a7a3872e2