diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:15:27 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:15:27 -0800 |
commit | 8fe40e09a5488b39bba460caccd685d907a78bd1 (patch) | |
tree | 74e4fa8f04fb0f7f8634e47a6ada7a35f4eaa0ec /pico | |
parent | fcc21f46aeca27a74898c1d111f4e153001db2a2 (diff) | |
parent | 196be3b6348f4a6c975d25dbee135fc3952e0ac7 (diff) | |
download | external_svox-8fe40e09a5488b39bba460caccd685d907a78bd1.zip external_svox-8fe40e09a5488b39bba460caccd685d907a78bd1.tar.gz external_svox-8fe40e09a5488b39bba460caccd685d907a78bd1.tar.bz2 |
am 196be3b6: am 8411d87e: reconcile main tree with open-source eclair
Merge commit '196be3b6348f4a6c975d25dbee135fc3952e0ac7'
* commit '196be3b6348f4a6c975d25dbee135fc3952e0ac7':
android-2.1_r1 snapshot
Diffstat (limited to 'pico')
0 files changed, 0 insertions, 0 deletions