| commit | d523e02177e5cbd2b0eb09b94a81862f3b24693e | [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 | 40eba9854181649292d945a590cf1f1a8e6de480 | |
| parent | 60d865967ce492e25840458045a0f23f68e41aa7 [diff] | |
| parent | 98787bf28b9845311f38ae1a08a562e111c43c36 [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