| commit | 1a15e527b2ba2e47884a3a44b6c073b2856f99ed | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Oct 07 11:14:08 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Fri Oct 07 11:14:08 2011 -0700 |
| tree | 735da56e582c70f022ca10a12756aa936e1766c1 | |
| parent | 833b45e9a6ac4e718c1a38732cb72c770bad6acd [diff] | |
| parent | 7e45cf25283c97a5d3300bba10c9d4a871d16c2b [diff] |
Merge remote branch 'goog/gingerbread' into honeycomb Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/tests/app/src/android/app/cts/DownloadManagerTest.java Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1