| commit | 6eb7128c9cadab4f823fc21f917b4bf81efe3b6e | [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 | 458970f0c1286dacfc03c750681be77a702aa058 | |
| parent | b8ddbd082adb24e44217d255377ef8618d242db1 [diff] | |
| parent | 8670b1c23f1c074ce430213efc69f573410eabd3 [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