| commit | bf64137257155c2485d1555eccf087d5b3e90b0d | [log] [tgz] |
|---|---|---|
| author | Brian Colonna <bcolonna@google.com> | Wed Nov 09 21:18:26 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 21:18:26 2011 +0000 |
| tree | c62a088df676bb0a38c773b1b01894aaadc4d46a | |
| parent | c1c95666eb367b1a68d290e61fb750558707bc56 [diff] | |
| parent | 1ae5b71a95c0472fd07d9928ff34ee1870081e66 [diff] |
am 1ae5b71a: resolved conflicts for merge of 7cf1eeb9 to master * commit '1ae5b71a95c0472fd07d9928ff34ee1870081e66': Fix 5514230: preventing null window token from occurring