Dees_Troy 1669f89dd2 Update to latest AOSP master ...

Merge in latest commits from AOSP master and fix merge conflicts

2013-09-04 19:00:58 +00:00

..

Android.mk

Update to latest AOSP master

2013-09-04 19:00:58 +00:00

Bits.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

DirUtil.c

Remove HAVE_SELINUX guards

2012-10-16 12:57:26 -07:00

DirUtil.h

Remove HAVE_SELINUX guards

2012-10-16 12:57:26 -07:00

Hash.c

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

Hash.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

inline_magic.h

Fix multiple defined symbol errors

2012-08-21 16:04:21 -04:00

Inlines.c

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

Log.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

SysUtil.c

Pass the correct pointer to munmap on failure.

2012-12-17 09:26:50 -08:00

SysUtil.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

Zip.c

reduce some recovery logging

2012-10-19 12:24:26 -07:00

Zip.h

Remove HAVE_SELINUX guards

2012-10-16 12:57:26 -07:00