Commits
The Android Open Source Project authored and Android Git Automerger committed bd724603cccM
am 258c04ef: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '258c04ef877891b1039b998d0b704525ab5b2345': Clear mWindowAdded when window was not added. DO NOT MERGE Fix reading sleep policy Work around saveLayer clipping/transform deferring issues Fix tethering Never call app_main more than once Don't use ADDR_COMPAT_LAYOUT on the emulator Don't update routes if Dhcp fails. Catch BadTokenException and continue. Respawn app_main if ADDR_COMPAT_LAYOUT is not set Remove WindowManager messages from remote queue. Put debug back in for b/b8263462. Remove old show/hide messages on new ime (DO NOT MERGE)
Showing diff to258c04ef877