summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Layoutlib_create flag -p: don't change all accesses to public.Raphael Moll2011-07-193-13/+30
* Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
|\
| * Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
* | Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
|\ \ | |/
| * Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
* | Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
|\ \
| * | stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
* | | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
|\ \ \
| * | | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
* | | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
|\ \ \ \
| * | | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
* | | | | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
|\ \ \ \ \
| * | | | | stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| | |/ / / | |/| | |
* | | | | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
|\ \ \ \ \
| * | | | | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| |/ / / /
* | | | | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
* | | | | Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-133-5/+9
|\ \ \ \ \
| * | | | | Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-03-213-5/+9
* | | | | | Merge "Added methods to support dns cache per interface"Robert Greenwalt2011-07-012-0/+80
|\ \ \ \ \ \
| * | | | | | Added methods to support dns cache per interfaceMattias Falk2011-04-192-0/+80
* | | | | | | Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."Conley Owens2011-06-301-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add FLAG_AUTO_CANCEL flag for multiple supl notifications.Anshuman Pandey2011-06-151-1/+1
* | | | | | | Merge "Add WEBP to the list of Image formats that support Compression."Jean-Baptiste Queru2011-06-242-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Add WEBP to the list of Image formats that support Compression.Vikas Arora2011-06-232-3/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Tweak for forward-compatibility"Jean-Baptiste Queru2011-06-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Tweak for forward-compatibilityJean-Baptiste Queru2011-06-241-0/+1
|/ / / / / /
* | | | | | Merge "Laoutlib_creator: keep original of delegate methods."Raphael Moll2011-06-228-117/+319
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Laoutlib_creator: keep original of delegate methods.Raphael Moll2011-06-178-117/+319
| |/ / / /
* | | | | Merge "Check if we are in daylight time when calculating timezone"Conley Owens2011-06-201-7/+3
|\ \ \ \ \
| * | | | | Check if we are in daylight time when calculating timezoneLavettacn Xiao2011-04-191-7/+3
| | |/ / / | |/| | |
* | | | | Merge "Tweaks for forward-compatibility"Jean-Baptiste Queru2011-06-184-0/+17
|\ \ \ \ \
| * | | | | Tweaks for forward-compatibilityJean-Baptiste Queru2011-06-184-0/+17
|/ / / / /
* | | | | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | | | Merge "Tweak setViewport stuff for fwd-compat"Jean-Baptiste Queru2011-06-082-18/+3
|\ \ \ \ \
| * | | | | Tweak setViewport stuff for fwd-compatJean-Baptiste Queru2011-06-082-18/+3
|/ / / / /
* | | | | Merge "Disable plugins if setPluginsEnabled(false) called."Romain Guy2011-06-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disable plugins if setPluginsEnabled(false) called.Tero Saarni2011-06-021-1/+1
|/ / / /
* | | | Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
|\ \ \ \
| * | | | Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
* | | | | Merge "Adding support for parsing of SMS-CB pdus in UMTS format."Jean-Baptiste Queru2011-05-253-28/+512
|\ \ \ \ \
| * | | | | Adding support for parsing of SMS-CB pdus in UMTS format.Henrik Hall2011-01-113-28/+512
* | | | | | Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."Conley Owens2011-05-243-34/+43
|\ \ \ \ \ \
| * | | | | | Fixing concurrency issue on IccPhoneBookInterfaceManager.David Sobreira Marques2011-05-203-34/+43
* | | | | | | Merge "Use proper type for oob variable in register_agent. Without this chang...Jaikumar Ganesh2011-05-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use proper type for oob variable in register_agent.Nicu Pavel2011-05-051-1/+1
* | | | | | | | Merge "BT: Wrong publishing result of bonding error code."Jaikumar Ganesh2011-05-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | BT: Wrong publishing result of bonding error code.Arek Lichwa2011-05-051-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "OBEX: Fix PrivateOutputStream small write problem"Jaikumar Ganesh2011-05-201-12/+9
|\ \ \ \ \ \ \ \