This is a test to see if I'm getting the commit right
Domination Patches test Do not merge/pull
Delete test
Merge remote-tracking branch 'upstream/master'
Delete Mms.apk.patch
Delete core.patch
Delete framework.patch
Delete preloaded.patch
Delete services.patch
Delete system
Delete telephony-common.patch
20130721 patches not working-think I derped the repo
Remove "-I" flag from rm utility- not present in BSD

Causing a complaint and stopping Log merging after update.
Rework PING_COUNT once more

Our unifying of Cygwin/Linux ping implementations broke BSD. Here is a
three-headed implementation, one for OSX and the other for Linux/Cygwin. The
issue is Cygwin and OSX were incompatible, Linux played nicely with both.

Already out for testing, hopefully works...
Ship aapt.exe with execute permissions

We take care of this in the script, but we wouldn't have had to if I had
noticed this earlier.
Hopefully fix bug with cygwin patching

That space meant we were calling an empty patch argument.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	auto_patcher
Merge remote-tracking branch 'upstream/master'

Conflicts:
	auto_patcher