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 | bzip2-879585bbef51b4cabaac6340a95d807dca379cdc.tar.gz |
am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from masterandroid-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbread
Merge commit '701ad7cca713ec5054e420bde1b32b86d18ef08b' into gingerbread
* commit '701ad7cca713ec5054e420bde1b32b86d18ef08b':
DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master
0 files changed, 0 insertions, 0 deletions