tree bcf31890f23d629f552c839dd802d3ea80855020
parent 0eeaa4643c75b4b099212d8e1a77a6063e5cb169
parent f5b6818009a70d77a272ca9b7b2aa167507dfd07
author Rob Carr <racarr@google.com> 1494891501 +0000
committer android-build-merger <android-build-merger@google.com> 1494891501 +0000

Merge "Preserve non-floating state when entering pinned stack." into oc-dev
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4