| commit | bcb9ab8d1dec48384b1d3f38a2bd90de070cfa87 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Jul 13 12:51:42 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Jul 13 12:51:42 2011 -0700 |
| tree | 5c6784eeb3832c290534d1c74b54d05694ea1567 | |
| parent | 177bac55f443aeeb10679345c9a56d0e764f48c6 [diff] | |
| parent | 03eae653f7bb0ed2299620c9c95837e5e0f48b7e [diff] |
Merge remote branch 'goog/honeycomb-mr1' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml tools/host/src/com/android/cts/Version.java Change-Id: I774af5228660f860a64e3bfec8baaab6643c3d84