tree 888bcc755070de3bd845285ec8e0c6ea5c9ff143
parent b445362bd67cf596cfdd39db2dbe8f42cf9a119a
parent 6233fbe5da2466da26245a35acc5129974dd5440
author Brian Colonna <bcolonna@google.com> 1320785496 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1320785496 -0800

Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0