diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:49:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:49:25 -0800 |
commit | b176f8cb88ad268c1faf33ef38964fbbdd3ace6f (patch) | |
tree | 7895fd7d4e1c2d47424860b91f92700fe6e1a011 | |
parent | 3696b3e5a7c6e499c4f70f3ef4b81f7ee95384f8 (diff) | |
parent | 05aaabf91b5c4ac039bf721fd02d6817e7d404be (diff) | |
download | yaffs2-b176f8cb88ad268c1faf33ef38964fbbdd3ace6f.tar.gz |
am 05aaabf9: reconcile main tree with open-source eclair
Merge commit '05aaabf91b5c4ac039bf721fd02d6817e7d404be' into eclair-plus-aosp
* commit '05aaabf91b5c4ac039bf721fd02d6817e7d404be':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions