tree 939bb7229a61f7fd45724a245bbacf7bb32e5bac
parent 481f4e788b98377096d1af45b2a0123947da050b
parent c4984925bceb5ef0b8d8fc3aca6826a6936faad4
author Jeff Sharkey <jsharkey@android.com> 1481305616 +0000
committer android-build-merger <android-build-merger@google.com> 1481305616 +0000

Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: ac7775f28e" into nyc-mr2-dev-plus-aosp
am: c4984925bc

Change-Id: I845f965386ffba92257a70b38779e1310664f314