diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2011-09-14 07:22:43 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2011-09-14 07:22:43 -0700 |
commit | 120c7be3b96ad42d92b9db1a75e5e5845bf3a723 (patch) | |
tree | f3a9d2b48fd07f69e79c1736b75443e51de5f03d | |
parent | 8ca43a0008a10ddd3915bfdc12f63440dc2a6a22 (diff) | |
parent | 1dcf32e403f3c7afe06d878e3a26e15d38d05a5b (diff) | |
parent | 4797d4667b26ee7d77d3fb626c26b688830e17ee (diff) | |
download | bouncycastle-120c7be3b96ad42d92b9db1a75e5e5845bf3a723.tar.gz |
Reconcile with gingerbread-release gingerbread-mr4-releaseandroid-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.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr0-releaseics-mr0ics-factoryrom-2-release
Change-Id: I7652fcb5face6c9940511e8d3aa0e3fa86432442