| commit | 636c31ade58acc490c9aca0a3acacc25da419773 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Wed Feb 16 14:28:49 2011 -0800 |
| committer | Brian Muramatsu <btmura@android.com> | Wed Feb 16 14:28:49 2011 -0800 |
| tree | 9f04be14c989e5a41f8dee79d455af2b7f94e7fa | |
| parent | 3bd4323ce4d90a2051010a8f9e2880140d5b2ec4 [diff] | |
| parent | 3642f69cc25f02666ef8cb8cf55083249436ef96 [diff] |
Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java Change-Id: I1befa31b0cce0a72a6d71760d18cae1bb97ca937