tree 39cd152e43c966f4713e7dc4f42ad3927b163633
parent 81cab1752ea95c5772a2141602c8654360c18896
author Dianne Hackborn <hackbod@google.com> 1321321519 -0800
committer The Android Automerger <android-build@android.com> 1323304933 -0800

DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...

...has wrong layout but corrects itself

Maybe fix issue #5405788: Device continuously opening and closing...

...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I7199b6de370488e8d897d6a78ff6f15624da862c