aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:49:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:49:13 -0800
commit7c00f1814b330dc2cff5662c203ca96cd3a15e8b (patch)
treedb745fc6de905d925ab23822f6dd90a36a980ccf
parent2364334bcf52a41bbb2bc0fb55ef77149121303a (diff)
parent0699845953d8a6d6ad52beaef39cd78fe04eefb8 (diff)
downloade2fsprogs-7c00f1814b330dc2cff5662c203ca96cd3a15e8b.tar.gz
am 06998459: reconcile main tree with open-source eclair
Merge commit '0699845953d8a6d6ad52beaef39cd78fe04eefb8' into eclair-plus-aosp * commit '0699845953d8a6d6ad52beaef39cd78fe04eefb8': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions