diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:09:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:09:54 -0800 |
| commit | 3ac755cb94d18309097ea5db733e176615e6182d (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /Android.mk | |
| parent | 95dbaa67a811fe9fdc2afdecbcfcaf9ef58bcc37 (diff) | |
| parent | b9ebfe977b2a65e941be2c97454e03f8f81fd643 (diff) | |
| download | protobuf-3ac755cb94d18309097ea5db733e176615e6182d.tar.gz protobuf-3ac755cb94d18309097ea5db733e176615e6182d.tar.bz2 protobuf-3ac755cb94d18309097ea5db733e176615e6182d.zip | |
am 96ccdc22: reconcile main tree with open-source eclair
Merge commit '96ccdc223b71f9e356d10ed3199007567996e062'
* commit '96ccdc223b71f9e356d10ed3199007567996e062':
android-2.1_r1 snapshot
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions