diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 15:53:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 15:53:16 -0700 |
| commit | 60c8f863ca84f3e5bb8e78d8001c53511f094d53 (patch) | |
| tree | 0af3cd99e4e85251ae4b32a4967e03b6e5e8716f /toolbox/Android.mk | |
| parent | 42b871f1bfc116d53d1bff9d7497415494b2e0e0 (diff) | |
| parent | 0fcbdb4147858d40d581d3b034f5150962632943 (diff) | |
| download | system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.zip system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.tar.gz system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.tar.bz2 | |
resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
Diffstat (limited to 'toolbox/Android.mk')
| -rw-r--r-- | toolbox/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 588dac0..ef3980a 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -41,7 +41,7 @@ TOOLS := \ printenv \ smd \ chmod \ - chown \ + chown \ newfs_msdos \ netstat \ ioctl \ |