tree 939bb7229a61f7fd45724a245bbacf7bb32e5bac
parent 202a92e2b0a6b175d3be7d23f8e1ca5c2c924aa2
parent f997be08ba324e87e9177984beefba87e096506c
author Jeff Sharkey <jsharkey@android.com> 1481305703 +0000
committer android-build-merger <android-build-merger@google.com> 1481305703 +0000

Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861
am: f997be08ba

Change-Id: I35930617f0aed984ab5ee8286396948d6a9f7831