| commit | 25a507bb0ddff80889eef36912540660057af1ff | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Aug 26 17:16:34 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Fri Aug 26 17:16:34 2011 -0700 |
| tree | cdea3ea13b973fc1e92c0f247d1c89579b38c02b | |
| parent | c3709ba4fdd9d80bd73f42e2092d0d631ea8c344 [diff] | |
| parent | e7ab987437e096df0b15c490693040825790ffa0 [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: I66f076447658a6628a46b88229ff16e1109e308f