tree f0dc3a1f20b9572d7bb7fcce1afab44403e8a53b
parent 73165c278e7585fbfd99569901c0e9e60d40bf2c
parent f7d1255782ce61e3a6ab03a128e004d001df9b8c
author Yuki Awano <yawano@google.com> 1486978202 +0000
committer android-build-merger <android-build-merger@google.com> 1486978202 +0000

Merge "Lock screen orientation of CapturedActivity" into nougat-mr1-cts-dev
am: f7d1255782

Change-Id: I339b697e3a13dacc9a8f036308067ea21a409b3f