diff options
| author | Nick Kralevich <nnk@google.com> | 2010-09-21 16:23:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 16:23:44 -0700 |
| commit | 879585bbef51b4cabaac6340a95d807dca379cdc (patch) | |
| tree | c53ea0dbb5b4ed8eb5599aa8c364446f502bf8dc | |
| parent | 172b266ed7845eac2edc7e7f8a72371356a9a277 (diff) | |
| parent | 701ad7cca713ec5054e420bde1b32b86d18ef08b (diff) | |
| download | android_external_bzip2-879585bbef51b4cabaac6340a95d807dca379cdc.tar.gz android_external_bzip2-879585bbef51b4cabaac6340a95d807dca379cdc.tar.bz2 android_external_bzip2-879585bbef51b4cabaac6340a95d807dca379cdc.zip | |
am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from mastercm-7.1.0gingerbread-releasegingerbreadgb-release-7.2
Merge commit '701ad7cca713ec5054e420bde1b32b86d18ef08b' into gingerbread
* commit '701ad7cca713ec5054e420bde1b32b86d18ef08b':
DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master
0 files changed, 0 insertions, 0 deletions