tree 9bb37730826fbe5e565e6820c37ca74d68b6e516
parent 13365e83c034cbbbb35af05564d525291a7597fe
parent 60aa99a95c26c5aec541ae346f6b072fc914b0c7
author Julia Reynolds <juliacr@google.com> 1524232314 -0700
committer android-build-merger <android-build-merger@google.com> 1524232314 -0700

Merge "Fix crash on rotation" into pi-dev am: 3bdd65e255
am: 60aa99a95c

Change-Id: I02a301bd9a83491acdf3c76e94a15253a3191e83