| commit | 456706e3e1c5b83519b68b2d6f97f617d04e5252 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Feb 28 18:25:14 2011 -0800 |
| committer | Brian Muramatsu <btmura@android.com> | Mon Feb 28 18:25:14 2011 -0800 |
| tree | d208181c7ceaa950e56f5ba417648980ffad5849 | |
| parent | 556d3504cb726e8e04e6f2aa92dd6eb7f6d18c4f [diff] | |
| parent | 8eac64e5b2723d074f20f80429e51abe0818dfe4 [diff] |
Merge remote branch 'korg/froyo' into froyomerge Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java tests/tests/view/src/android/view/cts/WindowTest.java Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b