| commit | fbb0042fe40e720edb5b9b3cf4f53e3ef3684c7c | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri May 07 10:44:30 2010 -0700 |
| committer | Dirk Dougherty <ddougherty@google.com> | Fri May 07 10:44:30 2010 -0700 |
| tree | d829c98030d3f802e7b015ddcc9cddda6a3b498c | |
| parent | 41d44d30bb556e1e90d67d00086bc07ce81d0373 [diff] | |
| parent | 0f7185d9213239b30013be7c7b097fe12f4ee12f [diff] |
Merge commit '0f7185d9' into master, resolve conflicts. Conflicts: samples/Spinner/_index.html samples/SpinnerTest/AndroidManifest.xml samples/SpinnerTest/_index.html samples/SpinnerTest/src/com/android/example/spinner/test/SpinnerActivityTest.java Change-Id: Ibd2bbd81c828c4a4337d2d0e397bd9a0b1e90728