summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* Merge "Unable to push files to Windows 7"Jaikumar Ganesh2011-04-192-2/+8
|\
| * Unable to push files to Windows 7Erik Ljungberg2011-03-222-2/+8
* | Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1121-61/+1202
|\ \
| * | Runtime resource overlay, iteration 1.MÃ¥rten Kongstad2011-04-0121-61/+1202
* | | Merge "audioflinger: Enable ARMv5TE optimized resampler"Brad Fitzpatrick2011-04-071-2/+6
|\ \ \
| * | | audioflinger: Enable ARMv5TE optimized resamplerJim Huang2011-04-071-2/+6
|/ / /
* | | Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
|\ \ \
| * | | Fix data corruption when writing to Bluetooth socketMike Playle2011-04-041-7/+13
| |/ /
* | | Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"Brad Fitzpatrick2011-04-042-2/+19
|\ \ \
| * | | Always return a valid index from Rfc822Tokenizer.findTokenEnd()Mattias Niklewski2011-04-042-2/+19
| |/ /
* | | Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-042-1/+133
|\ \ \ | |/ / |/| |
| * | Avoid crash in system server when mounting containerFredrik Helmer2011-04-042-1/+133
|/ /
* | Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildableRussell Brenner2011-03-311-0/+6
* | Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
* | Merge from gingerbreadThe Android Open Source Project2011-03-291-20/+31
|\ \
| * | egl: fixes for object refcountsMichael I. Gold2011-03-291-20/+31
* | | Merge "Error in compound cache-control header."Brad Fitzpatrick2011-03-292-1/+49
|\ \ \
| * | | Error in compound cache-control header.Henrik Baard2011-03-292-1/+49
| | |/ | |/|
* | | Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"Brad Fitzpatrick2011-03-281-1/+3
|\ \ \
| * | | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
* | | | Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Unregister callback from binder when vibration is removedMathias Jeppsson2011-03-241-0/+12
| |/ /
* | | Merge "Making it possible to call SIP calls with special allowed chars."Brad Fitzpatrick2011-03-232-4/+9
|\ \ \
| * | | Making it possible to call SIP calls with special allowed chars.Magnus Strandberg2011-03-222-4/+9
| |/ /
* | | Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
|\ \ \ | |/ / |/| |
| * | Fixing the wrong link in YuvImage JavaDoc.Keiji Ariyama2011-02-051-3/+3
* | | Merge "Removing dead store; it was likely a relict of debuging code."Brad Fitzpatrick2011-03-171-1/+0
|\ \ \
| * | | Removing dead store; it was likely a relict of debuging code.Jozef BABJAK2011-03-171-1/+0
|/ / /
* | | Merge "Releasing lock even if exception is thrown."Brad Fitzpatrick2011-03-151-4/+5
|\ \ \
| * | | Releasing lock even if exception is thrown.Jozef BABJAK2011-02-221-4/+5
* | | | Merge "Lazy initialization must be synchronized to avoid parallel instances c...Brad Fitzpatrick2011-03-151-18/+22
|\ \ \ \
| * | | | Lazy initialization must be synchronized to avoid parallel instances cretation.Jozef BABJAK2011-03-031-18/+22
| |/ / /
* | | | Merge "Removing self-assignment statement."Brad Fitzpatrick2011-03-151-1/+0
|\ \ \ \
| * | | | Removing self-assignment statement.Jozef BABJAK2011-02-221-1/+0
* | | | | Merge "Fixing self-assignment in copying code."Brad Fitzpatrick2011-03-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixing self-assignment in copying code.Jozef BABJAK2011-02-221-1/+1
* | | | | Merge "Fixing self-assignment in cloning code."Brad Fitzpatrick2011-03-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixing self-assignment in cloning code.Jozef BABJAK2011-02-221-1/+1
| |/ / /
* | | | Merge "Removing repetitive conditional; it simply does nothing except slowing...Brad Fitzpatrick2011-03-151-2/+1
|\ \ \ \
| * | | | Removing repetitive conditional; it simply does nothing except slowing down t...Jozef BABJAK2011-02-221-2/+1
* | | | | Merge "Removing repetitive conditional; it simply does nothing except slowing...Brad Fitzpatrick2011-03-151-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Removing repetitive conditional; it simply does nothing except slowing down t...Jozef BABJAK2011-02-221-2/+1
| |/ / /
* | | | Merge "Fixing improper boxing to Integer instead of Long."Brad Fitzpatrick2011-03-151-1/+1
|\ \ \ \
| * | | | Fixing improper boxing to Integer instead of Long.Jozef BABJAK2011-03-031-1/+1
* | | | | Merge "Using proper key for removing object from the map."Brad Fitzpatrick2011-03-151-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Using proper key for removing object from the map.Jozef BABJAK2011-02-211-3/+3
* | | | | Merge changes I81fc2f90,I5e7fd759Brad Fitzpatrick2011-03-152-5/+1
|\ \ \ \ \ | |/ / / /
| * | | | Using proper key for removing from map.Jozef BABJAK2011-02-211-1/+1
| * | | | Removing wrong equals method in comparator.Jozef BABJAK2011-02-211-4/+0
| |/ / /