tree 31cb3372e09e201eb184d73956be1eb3dcb74a01
parent 7f2953e9876cba25b2c0bab98320a38556d30150
parent 932bc6dffcdd2bfeba58821d0a48968a8f45c098
author Wale Ogunwale <ogunwale@google.com> 1501258893 +0000
committer android-build-merger <android-build-merger@google.com> 1501258893 +0000

Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev
am: 932bc6dffc

Change-Id: Icee06050d8000ada0ed7973a7befb90a1273238b