diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:42:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:42:48 -0800 |
| commit | 2387b97534b96ab8f07a07cf9c8e20d38962b1f1 (patch) | |
| tree | f7699cbb9a798281b3558f7e9588fd6d418a7a39 | |
| parent | 8199f491720b5bc1736bfa17047f22c5ea10196a (diff) | |
| parent | 0cb428518679211b5656f039ab41b1ff0cb19a1b (diff) | |
| download | tinyxml-2387b97534b96ab8f07a07cf9c8e20d38962b1f1.tar.gz | |
am 0cb42851: reconcile main tree with open-source eclair
Merge commit '0cb428518679211b5656f039ab41b1ff0cb19a1b' into eclair-plus-aosp
* commit '0cb428518679211b5656f039ab41b1ff0cb19a1b':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions