summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* dump bluedroid kernel status do not mergeMatthew Xie2014-07-141-0/+1
* Improve memory coherence management in screenshot code [DO NOT MERGE]Jesse Hall2014-07-142-20/+58
* Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]Jesse Hall2014-07-143-6/+9
* service_manager: check binder passed lengthsNick Kralevich2014-07-141-13/+29
* Merge "Add HDMI-CEC feature xml."Yuncheol Heo2014-07-101-0/+21
|\
| * Add HDMI-CEC feature xml.Yuncheol Heo2014-07-111-0/+21
* | Remove unnecessary code and APIs.Sreeram Ramachandran2014-07-113-106/+0
|/
* am 8098af6e: am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"Robin Lee2014-07-093-5/+5
|\
| * am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"Robin Lee2014-07-093-5/+5
| |\
| | * Merge "Rename 'mkuser' command to 'mkuserconfig'"Robin Lee2014-07-043-5/+5
| | |\
| | | * Rename 'mkuser' command to 'mkuserconfig'Robin Lee2014-06-103-5/+5
* | | | am d441dbc6: am cbb9d0d7: Merge "Make dex2oat heap size product configurable ...Brian Carlstrom2014-07-092-31/+40
|\ \ \ \ | |/ / /
| * | | am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/n...Brian Carlstrom2014-07-092-31/+40
| |\ \ \ | | |/ /
| | * | Merge "Make dex2oat heap size product configurable [frameworks/native]"Brian Carlstrom2014-07-072-31/+40
| | |\ \
| | | * | Make dex2oat heap size product configurable [frameworks/native]Brian Carlstrom2014-07-082-31/+40
* | | | | resolved conflicts for merge of 928e05b1 to masterSreeram Ramachandran2014-07-093-4/+25
|\ \ \ \ \ | |/ / / /
| * | | | am 0d2bee0c: Merge "Dump all the correct routing tables."Sreeram Ramachandran2014-07-093-4/+25
| |\ \ \ \ | | |/ / /
| | * | | Merge "Dump all the correct routing tables."Sreeram Ramachandran2014-07-053-4/+25
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Dump all the correct routing tables.Sreeram Ramachandran2014-07-083-4/+25
| | |/ /
* | | | Add ethernet feature xml.Joe LaPenna2014-07-081-0/+21
* | | | Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubIma...Ben Clayton2014-07-021-0/+63
|\ \ \ \
| * | | | Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D ca...Ben Clayton2014-07-071-0/+63
* | | | | resolved conflicts for merge of 1aa9565c to masterNick Kralevich2014-07-071-48/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am f9cfae24: Merge "Remove inline access control in service_manager."Nick Kralevich2014-07-071-42/+1
| |\ \ \ | | |/ /
| | * | Merge "Remove inline access control in service_manager."Nick Kralevich2014-07-021-42/+1
| | |\ \
| | | * | Remove inline access control in service_manager.Riley Spahn2014-06-261-42/+1
* | | | | Merge "Fix non-portable definition of CryptoPlugin::SubSample"Jeff Tinker2014-07-011-2/+2
|\ \ \ \ \
| * | | | | Fix non-portable definition of CryptoPlugin::SubSampleJeff Tinker2014-07-011-2/+2
* | | | | | Merge "BufferQueue: Add allocateBuffers method"Dan Stoza2014-06-2710-0/+129
|\ \ \ \ \ \
| * | | | | | BufferQueue: Add allocateBuffers methodDan Stoza2014-06-2010-0/+129
* | | | | | | am 1da16ceb: am a5726eb9: Merge "Use current max product dalvik.vm.heapsize a...Brian Carlstrom2014-06-270-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex...Brian Carlstrom2014-06-271-1/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"Brian Carlstrom2014-06-261-1/+8
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Use current max product dalvik.vm.heapsize as default dex2oat heap sizeBrian Carlstrom2014-06-271-1/+8
| | |/ / /
* | | | | Use current max product dalvik.vm.heapsize as default dex2oat heap sizeBrian Carlstrom2014-06-271-1/+8
* | | | | GLConsumer: Allow creation in detached modeDan Stoza2014-06-252-17/+49
* | | | | GLConsumer: Stop using default constructor paramsDan Stoza2014-06-246-10/+13
* | | | | am 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex ...Narayan Kamath2014-06-243-8/+29
|\ \ \ \ \ | |/ / / /
| * | | | am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."Narayan Kamath2014-06-243-8/+29
| |\ \ \ \ | | |/ / /
| | * | | Merge "Exclude subdirectories when pruning the dex cache."Narayan Kamath2014-06-243-8/+29
| | |\ \ \
| | | * | | Exclude subdirectories when pruning the dex cache.Narayan Kamath2014-06-203-8/+29
* | | | | | Use openssl's SHA1 instead of bionic's.Dan Albert2014-06-202-7/+11
* | | | | | Merge "SurfaceFlinger: send VSYNC power hints to IPowerManager"Ruchi Kandoi2014-06-205-34/+63
|\ \ \ \ \ \
| * | | | | | SurfaceFlinger: send VSYNC power hints to IPowerManagerRuchi Kandoi2014-06-185-34/+63
| | |_|_|/ / | |/| | | |
* | | | | | Merge "SurfaceFlinger: Fix rect out-of-bounds checks"Dan Stoza2014-06-171-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | SurfaceFlinger: Fix rect out-of-bounds checksDan Stoza2014-06-111-4/+4
* | | | | | Merge "Add two new display info fields"Andy McFadden2014-06-172-2/+21
|\ \ \ \ \ \
| * | | | | | Add two new display info fieldsAndy McFadden2014-06-172-2/+21
* | | | | | | am 724473b3: am 71f9956a: Merge "Fix obsolete argument name"Brian Carlstrom2014-06-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 71f9956a: Merge "Fix obsolete argument name"Brian Carlstrom2014-06-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |