summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * :Revert "Update ion header"The Android Automerger2012-08-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Upgrade to dlmalloc 2.8.5."Brian Carlstrom2012-08-228-7010/+6232
| | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Restore posix_memalign"Brian Carlstrom2012-08-221-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When compiling with clang, don't "fortify_source" the strlcpy andShih-wei Liao2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When compiling with clang, don't "fortify_source" the strlen.Shih-wei Liao2012-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Fix the clang build: this compiler doesn't support the gnu_inline fun...Shih-wei Liao2012-08-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update msm_camera.h to version that supports instance handle based lookupAjay Dudani2012-08-031-314/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * am 681ccffb: Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.hEd Heyl2012-07-2929-724/+10672
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ am d6c3369c: am 7a450b4d: am 643e5722: Merge "Report errors to the log, not j...Elliott Hughes2012-07-277-83/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ am c823b2c7: am 616f3680: am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage ...Elliott Hughes2012-07-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ am d7dfcb0c: am 514ace95: am 9061c6e7: Merge "Replace ALL_PREBUILTS with BUIL...Elliott Hughes2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ am 22bd479e: am e35ae86e: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ am 408e3e50: am 45038ae4: am 12f411d9: Merge "Correction to use of TEMP_FAILU...Elliott Hughes2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ am c636ff19: am 9a9ca7c1: am 7d6c3f70: Merge "Remove the \'Factory\' time zon...Elliott Hughes2012-07-263-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | Replace ALL_PREBUILTS with BUILD_PREBUILTYing Wang2012-07-261-15/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to tzdata2012h.Elliott Hughes2012-10-283-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to tzdata2012g.Elliott Hughes2012-10-183-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up the private variables.Ying Wang2012-10-101-0/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic: update processed msm_mdp.hNaseer Ahmed2012-10-021-90/+107
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Test flags before using "info"" into jb-mr1-devAndy McFadden2012-10-021-9/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test flags before using "info"Andy McFadden2012-10-021-9/+49
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic: update processed msm_vidc_enc.hAndreas Huber2012-10-021-34/+35
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctlSaurabh Shah2012-09-281-88/+91
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions t...Elliott Hughes2012-09-242-93/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t ...Elliott Hughes2012-09-242-41/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to...Elliott Hughes2012-09-242-41/+93
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."Elliott Hughes2012-09-242-41/+93
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the libcutils localtime_tz and mktime_t extensions to bionic.Elliott Hughes2012-09-112-41/+93
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-u...Elliott Hughes2012-09-241-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 85049ead: Merge "Use hidden visibility for several internal-use-only funct...Elliott Hughes2012-09-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use hidden visibility for several internal-use-only functions."Elliott Hughes2012-09-231-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use hidden visibility for several internal-use-only functions.Elliott Hughes2012-09-211-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_ar...Elliott Hughes2012-09-2417-80/+170
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for...Elliott Hughes2012-09-2417-80/+170
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /