| commit | 0d18cd896a9c90886786e417e9f4b31503a2feeb | [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 | 7b9632d183eba70ea76e9799d7e6232beaf71430 | |
| parent | 7e955838757064af4117c9a31730c48af4e3ea86 [diff] | |
| parent | f9be02e225526968ac3e7f596a411445672bc150 [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