aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-10-29 18:30:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 18:30:51 -0700
commitfa4610215cef5d4ccff7357c62d332d4d93e0f13 (patch)
tree014a8f5134e725a066116592fa3b9f1562e7c816
parent7d0891efa38af61302b644a3c150fa6fa4367b42 (diff)
parent49dcc4de79c93de65c20706b798353be1e840915 (diff)
downloadexternal_qemu-fa4610215cef5d4ccff7357c62d332d4d93e0f13.zip
external_qemu-fa4610215cef5d4ccff7357c62d332d4d93e0f13.tar.gz
external_qemu-fa4610215cef5d4ccff7357c62d332d4d93e0f13.tar.bz2
am 49dcc4de: Fix typo which prevented the computation of the default /data partition size from working properly.
Merge commit '49dcc4de79c93de65c20706b798353be1e840915' into eclair * commit '49dcc4de79c93de65c20706b798353be1e840915': Fix typo which prevented the computation of the default /data partition size
-rw-r--r--android/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c
index 6e467b9..7b20919 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1800,7 +1800,7 @@ int main(int argc, char **argv)
unsigned cachePartitionSize = 0;
unsigned systemPartitionSize = 0;
unsigned dataPartitionSize = 0;
- unsigned defaultPartitionSize = convertBytesToMB(66);
+ unsigned defaultPartitionSize = convertMBToBytes(66);
AndroidHwConfig* hw;
AvdInfo* avd;