diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:47:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:47:33 -0800 |
commit | 4a2479e7c81671a4b3823565cc00aad59d9f4868 (patch) | |
tree | f02ba1bc29f4fe6853d9b7008eed37cdcfb96e81 | |
parent | 42309f82c906c3bf660f52bf6cb1242bbabdc32d (diff) | |
parent | 198fe95bdbe59b9d2048c9ccb015132bfed578b2 (diff) | |
download | external_proguard-4a2479e7c81671a4b3823565cc00aad59d9f4868.tar.gz external_proguard-4a2479e7c81671a4b3823565cc00aad59d9f4868.tar.bz2 external_proguard-4a2479e7c81671a4b3823565cc00aad59d9f4868.zip |
am 198fe95b: reconcile main tree with open-source eclair
Merge commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2' into eclair-plus-aosp
* commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions