tree 11280ecb4956534f955b9e513754c11b98e997ad
parent ab065b63be1bfa8f95a372a4a5629fa16f54c75e
parent 63a0662d03791460a6ba882851e95b3e9eaf8b3b
author Svet Ganov <svetoslavganov@google.com> 1528509052 -0700
committer android-build-merger <android-build-merger@google.com> 1528509052 -0700

Merge "Handle race between UID state and activty resume" into pi-dev
am: 63a0662d03

Change-Id: I9e687fb5adbb2c20d2932ace73b868920095bc41