diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 12:41:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 12:41:54 -0700 |
| commit | 151047a8003fb69077c8900f2cc4b6b9376ee04b (patch) | |
| tree | d09d8195a13576983e4670d54a1627884f6cf04a /toolbox/Android.mk | |
| parent | 32a0056ff2a968a8a259dacd5d75fd2c22611e92 (diff) | |
| parent | c3109591d4a34d7802112706128db2bd451d853b (diff) | |
| download | system_core-151047a8003fb69077c8900f2cc4b6b9376ee04b.zip system_core-151047a8003fb69077c8900f2cc4b6b9376ee04b.tar.gz system_core-151047a8003fb69077c8900f2cc4b6b9376ee04b.tar.bz2 | |
Merge change 6257
* changes:
resolved conflicts for merge of 72eead43 to master
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 5a8dc0b..70b13dc 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -42,7 +42,7 @@ TOOLS := \ smd \ chmod \ chown \ - mkdosfs \ + newfs_msdos \ netstat \ ioctl \ mv \ |