commit 558ca722a5647cf250dcb44255a52b060a1f261e
author The Android Automerger <android-build@android.com> Mon Mar 05 07:06:29 2012 -0800
committer The Android Automerger <android-build@android.com> Mon Mar 05 07:06:29 2012 -0800
tree cbf47b697204d151790f80428be2b73e6cf30500
parent 0afee8b668d1ff5bae4294108d5e21abfae28d12
parent 1798a88e3f16935a3c9fa1f4f012a3be2b40b106

merge in jb-release history after reset to master

include/system/audio_policy.h

diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 1e0af7d..d45758a 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -34,7 +34,7 @@
  * sharing an output with other AudioTracks)
  */
 typedef enum {
-    AUDIO_POLICY_OUTPUT_FLAG_INDIRECT = 0x0,
+    AUDIO_POLICY_OUTPUT_FLAG_NONE = 0x0,
     AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1
 } audio_policy_output_flags_t;
 

init/init.c

diff --git a/init/init.c b/init/init.c
index 71c28b5..1ee88a7 100755
--- a/init/init.c
+++ b/init/init.c
@@ -940,7 +940,7 @@
     }
 
         /* run all property triggers based on current state of the properties */
-    queue_builtin_action(queue_property_triggers_action, "queue_propety_triggers");
+    queue_builtin_action(queue_property_triggers_action, "queue_property_triggers");
 
 
 #if BOOTCHART

toolbox/chown.c

diff --git a/toolbox/chown.c b/toolbox/chown.c
index 7b24c52..92efee6 100644
--- a/toolbox/chown.c
+++ b/toolbox/chown.c
@@ -15,7 +15,7 @@
     int i;
 
     if (argc < 3) {
-        fprintf(stderr, "Usage: chown <USER>[.GROUP] <FILE1> [FILE2] ...\n");
+        fprintf(stderr, "Usage: chown <USER>[:GROUP] <FILE1> [FILE2] ...\n");
         return 10;
     }
 
@@ -24,7 +24,9 @@
     char user[32];
     char *group = NULL;
     strncpy(user, argv[1], sizeof(user));
-    if ((group = strchr(user, '.')) != NULL) {
+    if ((group = strchr(user, ':')) != NULL) {
+        *group++ = '\0';
+    } else if ((group = strchr(user, '.')) != NULL) {
         *group++ = '\0';
     }