diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-06-22 10:58:55 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-06-22 10:58:55 -0700 |
| commit | dcf52bd71fc3b0c07f9919b5d82064c425abcbdb (patch) | |
| tree | 63cd52df5579c29eba0a4898e84c4c693f546d56 | |
| parent | 54ce6cb5d13f732a3e71aa3555cd3709d5bf3cf5 (diff) | |
| parent | 05ffe585d10252e47a7a3911aeefe1e28494f324 (diff) | |
| download | mockwebserver-ics-mr1.tar.gz | |
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release
0 files changed, 0 insertions, 0 deletions