tree ba1c5b6f981bc104c6546bd5b924cf4cac6eb779
parent 98af408afd3b151e0945be5223f0c3ff8e845af8
parent 1eee2b4994874e1d1023de294dd0d3f692ff9638
author Rob Carr <racarr@google.com> 1502297909 +0000
committer android-build-merger <android-build-merger@google.com> 1502297909 +0000

Merge "Ensure we leave the orientation changing state." into oc-dr1-dev
am: 1eee2b4994

Change-Id: I72e920090a147053bf7e6e61adb720c908bcd9c4