| commit | d1759f5ebe85f068469aa0c94cc6935648e5e28b | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Jun 15 17:10:12 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Jun 15 17:10:12 2011 -0700 |
| tree | f0e6f6fff57ceb729f9e369a4e0e7e510960363b | |
| parent | d188ecde401dd2bee1cb55f37b9e1e1c199cb4e7 [diff] | |
| parent | 75ba8288c14150e448091c938ac9cbb15161fae8 [diff] |
Merge remote branch 'goog/honeycomb' into manualmerge Conflicts: tests/tests/hardware/src/android/hardware/cts/CameraTest.java tools/host/src/com/android/cts/Version.java Change-Id: I3ead5d59f72aaa760cac3aa694aec669607d64f4