tree dd53c18dd09bb8d0020e9a246303ea51f93d8b44
parent c271fd44256ca441b6b8eeb21d8646ff2f950531
parent c091a649ad496e5b0c60ea5c0ba534fe161efbab
author George Mount <mount@google.com> 1494946060 +0000
committer android-build-merger <android-build-merger@google.com> 1494946060 +0000

Merge "Fix back stack problems due to postponed transitions" into oc-dev am: ce50eb2d17
am: c091a649ad

Change-Id: If14705a262ea3ee35d626f7e3d2deb6ddc035682