commit a95c0fa986cf8e6205e04e26b7069d4eeb1bd6de
author The Android Automerger <android-build@android.com> Tue Sep 11 07:00:15 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Sep 11 07:00:15 2012 -0700
tree 007d92a6cb53566525acd5d89e095256fea7c56c
parent 0f5e303c6a88c63fc5a4d325ab675af7ed57b777
parent bf929a985381c3f148078c5e8f727ee111e0213b

merge in jb-mr1-release history after reset to jb-mr1-dev

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 898d452..06a6a13 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -850,6 +850,11 @@
         return 0;
     }
 
+    if (argc > 0 && !strcmp(*argv, "help")) {
+        usage();
+        return 0;
+    }
+
     usb = open_device();
 
     while (argc > 0) {
@@ -940,9 +945,6 @@
             wants_reboot = 1;
         } else if(!strcmp(*argv, "oem")) {
             argc = do_oem_command(argc, argv);
-        } else if (!strcmp(*argv, "help")) {
-            usage();
-            return 0;
         } else {
             usage();
             return 1;

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3d57211..a32cb93 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -209,6 +209,7 @@
     mkdir /data/data 0771 system system
     mkdir /data/app-private 0771 system system
     mkdir /data/app-asec 0700 root root
+    mkdir /data/app-lib 0771 system system
     mkdir /data/app 0771 system system
     mkdir /data/property 0700 root root
     mkdir /data/ssh 0750 root shell