diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:45:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:45:00 -0800 |
commit | 196be3b6348f4a6c975d25dbee135fc3952e0ac7 (patch) | |
tree | 4641fc54bdceeb45c2313b2f0a19a2ae7f11e2cf /pico | |
parent | d2cb8a75dc6d7393d84cac6b3cad08260b9e2e6f (diff) | |
parent | 8411d87eefef7af413367b52def3d63250142ff4 (diff) | |
download | external_svox-196be3b6348f4a6c975d25dbee135fc3952e0ac7.zip external_svox-196be3b6348f4a6c975d25dbee135fc3952e0ac7.tar.gz external_svox-196be3b6348f4a6c975d25dbee135fc3952e0ac7.tar.bz2 |
am 8411d87e: reconcile main tree with open-source eclair
Merge commit '8411d87eefef7af413367b52def3d63250142ff4' into eclair-plus-aosp
* commit '8411d87eefef7af413367b52def3d63250142ff4':
android-2.1_r1 snapshot
Diffstat (limited to 'pico')
0 files changed, 0 insertions, 0 deletions