| commit | 0d887e371199ee6fc97883708f71b7a1677d2d8c | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed May 18 12:45:54 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed May 18 12:46:35 2011 -0700 |
| tree | 3f40a353c13da9219105f1650af1abc59f8ce302 | |
| parent | 6603f144bfdacc53cd2c7a71a1d8e52939db0264 [diff] | |
| parent | f5b10ee3f573e24716b7955c6df3a3363605a889 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java tools/host/src/com/android/cts/Version.java Change-Id: Id85601211ee77f20f8f39112bfab1d2fd8521cbb