| commit | 75ba8288c14150e448091c938ac9cbb15161fae8 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Jun 15 14:36:28 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Jun 15 14:36:28 2011 -0700 |
| tree | fc67c41897f45911977df484aba3e3cbb0c45026 | |
| parent | a39c49ba6e21ae5b842e93a268a29191144c72be [diff] | |
| parent | 5e50522aea7f9219467ecf4fd2a7addb7ba6fe29 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/text/src/android/text/method/cts/TouchTest.java tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java tools/host/src/com/android/cts/Version.java Change-Id: I6196b9bd85b4e93978dd0ae9b457812b08bd7f0e