summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Some more test cleanup.Dan Albert2014-10-162-30/+36
* Merge "Use LOCAL_CLANG := false for GLES wrappers for now"Chih-hung Hsieh2014-10-161-0/+2
|\
| * Use LOCAL_CLANG := false for GLES wrappers for nowBernhard Rosenkraenzer2014-10-151-0/+2
* | Merge "Don't check if this == NULL."Dan Albert2014-10-153-4/+8
|\ \
| * | Don't check if this == NULL.Dan Albert2014-09-163-4/+8
* | | Merge "Link sigchain to surfaceflinger main executable"Dmitriy Ivanov2014-10-142-3/+27
|\ \ \ | |_|/ |/| |
| * | Link sigchain to surfaceflinger main executableDmitriy Ivanov2014-10-092-3/+27
|/ /
* | Merge "Allow more than one dex2oat extra option"Narayan Kamath2014-10-011-5/+38
|\ \
| * | Allow more than one dex2oat extra optionYevgeny Rouban2014-09-171-5/+38
* | | Merge "Fix a null dereference."Dan Albert2014-09-231-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a null dereference.Dan Albert2014-09-231-1/+1
|/ /
* | Merge "Clean cruft out of makefiles."Dan Albert2014-09-128-49/+17
|\ \
| * | Clean cruft out of makefiles.Dan Albert2014-09-118-49/+17
|/ /
* | Merge "Fix warnings on unused variables and parameters."Chih-Hung Hsieh2014-09-123-28/+25
|\ \
| * | Fix warnings on unused variables and parameters.Chih-Hung Hsieh2014-09-113-28/+25
* | | Merge "Work around C11 const atomic restrictions."Hans Boehm2014-09-111-1/+9
|\ \ \ | |/ / |/| |
| * | Work around C11 const atomic restrictions.Hans Boehm2014-09-111-1/+9
|/ /
* | Merge "Silence warnings about unused parameters."Dan Albert2014-09-116-15/+15
|\ \
| * | Silence warnings about unused parameters.Dan Albert2014-09-096-15/+15
| |/
* | Merge "Fix clang warnings about struct vs. class."Dan Albert2014-09-103-3/+3
|\ \
| * | Fix clang warnings about struct vs. class.Dan Albert2014-09-093-3/+3
| |/
* | Merge "Use time() instead of clock() for timeouts."Christopher Ferris2014-09-091-4/+4
|\ \ | |/ |/|
| * Use time() instead of clock() for timeouts.Christopher Ferris2014-09-091-4/+4
|/
* Merge "Make string literal concatenation play nice with C++11."Dan Albert2014-09-095-25/+25
|\
| * Make string literal concatenation play nice with C++11.Dan Albert2014-09-085-25/+25
* | Merge "Fix relabeling of secondary user package directories."Nick Kralevich2014-09-081-1/+1
|\ \ | |/ |/|
| * Fix relabeling of secondary user package directories.Stephen Smalley2014-09-081-1/+1
|/
* Merge "Remove obsolete prunedexcache"Brian Carlstrom2014-08-283-55/+0
|\
| * Remove obsolete prunedexcacheAlex Light2014-08-283-55/+0
|/
* Merge "Add vm_safe_mode to dexopt."Calin Juravle2014-08-273-10/+16
|\
| * Add vm_safe_mode to dexopt.Calin Juravle2014-08-273-10/+16
|/
* Merge "Pass isa features flag to dex2oat."Calin Juravle2014-08-261-8/+21
|\
| * Pass isa features flag to dex2oat.Calin Juravle2014-08-261-8/+21
* | Merge "Fix validation of system paths in installd."Calin Juravle2014-08-222-27/+67
|\ \ | |/
| * Fix validation of system paths in installd.Calin Juravle2014-08-222-27/+67
* | Merge "Allow apk path to contain one subdirectory."Calin Juravle2014-08-222-26/+27
|\ \ | |/
| * Allow apk path to contain one subdirectory.Calin Juravle2014-08-222-26/+27
|/
* Merge "Fix CAS argument type."Hans Boehm2014-08-161-1/+1
|\
| * Fix CAS argument type.Hans Boehm2014-08-191-1/+1
* | Merge "Use gettid directly in binder."Elliott Hughes2014-08-161-1/+1
|\ \
| * | Use gettid directly in binder.Elliott Hughes2014-08-181-1/+1
| |/
* | Merge "Disable verification based on vold.decrypt. [frameworks/native]"Brian Carlstrom2014-08-151-1/+1
|\ \ | |/ |/|
| * Disable verification based on vold.decrypt. [frameworks/native]Brian Carlstrom2014-08-151-1/+1
|/
* Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 ...Hans Boehm2014-08-122-15/+21
|\
| * Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-08-122-15/+21
* | Merge "Change an accidental ALOGE to an ALOGV"Andreas Gampe2014-08-111-1/+1
|\ \
| * | Change an accidental ALOGE to an ALOGVAlex Light2014-08-111-1/+1
* | | Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"Narayan Kamath2014-08-071-0/+5
|\ \ \ | |/ / |/| |
| * | Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroupBrian Carlstrom2014-08-081-0/+5
|/ /
* | Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-08-082-21/+15
|\ \ | |/