diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:46:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:46:07 -0800 |
| commit | 2fbf97b3b53a12583acb161e8df8aa5f1105d2d6 (patch) | |
| tree | 936b00e763106a28dd58b7ae890ccf8117282ba9 | |
| parent | 656f4f53664dd53ee2e5219629a6674ab82e5bab (diff) | |
| parent | 572f793bcdcae936229709941bb3af46473af159 (diff) | |
| download | glib-2fbf97b3b53a12583acb161e8df8aa5f1105d2d6.tar.gz | |
am 572f793b: reconcile main tree with open-source eclair
Merge commit '572f793bcdcae936229709941bb3af46473af159' into eclair-plus-aosp
* commit '572f793bcdcae936229709941bb3af46473af159':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions