diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:13:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:13:44 -0800 |
| commit | 7746d104100a9ae443f7cfe2964ebe8287e733be (patch) | |
| tree | f7699cbb9a798281b3558f7e9588fd6d418a7a39 | |
| parent | 8a7c8b922d682cdf821fcaa2c8267ba062320b9a (diff) | |
| parent | 2387b97534b96ab8f07a07cf9c8e20d38962b1f1 (diff) | |
| download | tinyxml-7746d104100a9ae443f7cfe2964ebe8287e733be.tar.gz | |
am 2387b975: am 0cb42851: reconcile main tree with open-source eclair
Merge commit '2387b97534b96ab8f07a07cf9c8e20d38962b1f1'
* commit '2387b97534b96ab8f07a07cf9c8e20d38962b1f1':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions