| commit | cee45593a82038187bd438f818235af2595a87fa | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Aug 01 14:23:52 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Mon Aug 01 14:23:52 2011 -0700 |
| tree | 5031e2bd006fb52570d7a931afcd4a84b66e19c7 | |
| parent | 4e9df1a479d6fe383fed0adf9ab3c4f9b7729934 [diff] | |
| parent | 4ad91e4d2e7f62b7e2e3aef5089536a4f0cd8ce2 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java tests/expectations/knownfailures.txt tests/tests/os/src/android/os/cts/BuildVersionTest.java tools/host/src/com/android/cts/Version.java Change-Id: I9521c6c60c60a1a36d7a882637290303bcee4997