| commit | 0bcdf4ac97077547e9c2466574d891da8b7c8fc5 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Oct 07 11:55:14 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Fri Oct 07 11:55:14 2011 -0700 |
| tree | b8b89ae15f9753bd7e97d8413256da6fc5f444e5 | |
| parent | 68f66bffff2299aab6103b8fb01854988430c147 [diff] | |
| parent | 93ca5b572b2bd52d9dcb8a26cb14c07ae0a12ffc [diff] |
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 Conflicts: apps/CtsVerifier/AndroidManifest.xml tools/host/src/com/android/cts/Version.java Change-Id: I5e9642c74dd3381865e731567e7decebb9ab2b71