tree 1e8a732d2bfa97c651800dcc814f288b2c378126
parent 20b3fd5bffc14fb9ee8e1c340e17dc28cbb7a472
parent e44b70a8b84c287b9de7011433371f7ad423e11f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1524086617 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1524086617 +0000

[automerger skipped] Merge "Fix screen rotation during print tests." into nougat-mr1-cts-dev am: 2f5a6460f0  -s ours skipped: 1c27013195 skipped: c34174a807 skipped: e44b70a8b8

Change-Id: Iabdfda53f5af92f4f2113e43cf5c3480a23a59cb