aboutsummaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:22:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:22:49 -0800
commitda846fcf1b6a7bbd2f9f30c965b25f084568ef75 (patch)
tree211ce66dd971d75f0b20a26b3571898330933815 /edify
parent4e9332cb0bb84df4c08bbb469e59a54eab2a9df0 (diff)
parent4c382b13657be5d949e7dfc9ef46a66f2eb496e0 (diff)
downloadbootable_recovery-da846fcf1b6a7bbd2f9f30c965b25f084568ef75.zip
bootable_recovery-da846fcf1b6a7bbd2f9f30c965b25f084568ef75.tar.gz
bootable_recovery-da846fcf1b6a7bbd2f9f30c965b25f084568ef75.tar.bz2
am 4c382b13: reconcile main tree with open-source eclair
Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp * commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0': android-2.1_r1 snapshot
Diffstat (limited to 'edify')
0 files changed, 0 insertions, 0 deletions