summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-156-7/+27
* Revise some javadocs for NFC; add package descriptionScott Main2010-10-158-68/+104
* Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-0/+8
|\
| * DO NOT MERGEShimeng (Simon) Wang2010-10-151-0/+8
* | Merge "Include the framework copy of the OpenMAX headers instead of referenci...Andreas Huber2010-10-1517-20/+23
|\ \
| * | Include the framework copy of the OpenMAX headers instead of referencing exte...Andreas Huber2010-10-1517-20/+23
* | | Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included fr...Andreas Huber2010-10-1510-0/+6937
|\ \ \ | |/ /
| * | Check-in of a copy of the Khronos OpenMAX headers formerly included from exte...Andreas Huber2010-10-1510-0/+6937
* | | Merge "Work on issue #3101415: Crespo apps seem to have their UID changed ove...Dianne Hackborn2010-10-1511-9/+52
|\ \ \
| * | | Work on issue #3101415: Crespo apps seem to have their UID changed over time.Dianne Hackborn2010-10-1511-9/+52
* | | | Merge "fix build DO NOT MERGE" into gingerbreadIrfan Sheriff2010-10-151-1/+1
|\ \ \ \
| * | | | fix build DO NOT MERGEIrfan Sheriff2010-10-151-1/+1
* | | | | Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into ...Justin Ho2010-10-154-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | DO NOT MERGE - Updated media transport controls (hdpi and mdpi)Justin Ho2010-10-154-0/+0
* | | | | Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-1/+5
|\ \ \ \ \
| * | | | | DO NOT MERGEShimeng (Simon) Wang2010-10-151-1/+5
* | | | | | Merge "Line up textfield with WebTextView more often." into gingerbreadLeon Scroggins2010-10-151-10/+23
|\ \ \ \ \ \
| * | | | | | Line up textfield with WebTextView more often.Leon Scroggins2010-10-151-10/+23
* | | | | | | Merge "fetch macaddr right after supplicant connection" into gingerbreadIrfan Sheriff2010-10-151-0/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | fetch macaddr right after supplicant connectionIrfan Sheriff2010-10-151-0/+6
* | | | | | | am fda5b19c: Merge "docs: fix typo; surface dev guide link in package descrip...Scott Main2010-10-152-8/+9
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "docs: fix typo; surface dev guide link in package description" into froyoScott Main2010-10-152-8/+9
| |\ \ \ \ \ \ \
| | * | | | | | | docs: fix typo; surface dev guide link in package descriptionScott Main2010-10-152-8/+9
* | | | | | | | | am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | docs: fix code snippet errorsScott Main2010-10-151-4/+4
| |/ / / / / / /
* | | | | | | | Merge "DO NOT MERGE - Updated ADB icon" into gingerbreadJustin Ho2010-10-152-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | DO NOT MERGE - Updated ADB iconJustin Ho2010-10-152-0/+0
* | | | | | | Debug logs for issue #3101415: Apps seem to have their UID changed over time.Dianne Hackborn2010-10-152-24/+30
* | | | | | | Merge "NFC: Move NFC service implementation out of system_server." into ginge...Nick Pelly2010-10-1519-3012/+344
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-1519-3012/+344
| | |_|/ / / | |/| | | |
* | | | | | Revert "Update the documentation for content provider security."Nick Kralevich2010-10-151-13/+4
* | | | | | Merge "Update the documentation for content provider security." into gingerbreadNick Kralevich2010-10-151-4/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update the documentation for content provider security.Chris Palmer2010-10-121-4/+13
* | | | | | Merge "Make sure we cache the sampleTable again if using the caching datasour...Andreas Huber2010-10-151-1/+3
|\ \ \ \ \ \
| * | | | | | Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge "Don't crash on null Vibrator during reboot." into gingerbreadBrad Fitzpatrick2010-10-152-3/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't crash on null Vibrator during reboot.Brad Fitzpatrick2010-10-142-3/+21
| | |/ / / | |/| | |
* | | | | Merge "Improve input device calibration format." into gingerbreadJeff Brown2010-10-152-135/+207
|\ \ \ \ \
| * | | | | Improve input device calibration format.Jeff Brown2010-10-142-135/+207
* | | | | | Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-141-4/+4
|\ \ \ \ \ \
| * | | | | | Revert to using epoll_wait().Jeff Brown2010-10-071-4/+4
* | | | | | | Merge "SipService: add wake lock for incoming INVITE packets." into gingerbreadHung-ying Tyan2010-10-143-46/+92
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SipService: add wake lock for incoming INVITE packets.Hung-ying Tyan2010-10-153-46/+92
* | | | | | | Merge "Updated GPS icons and new status bar background" into gingerbreadJustin Ho2010-10-146-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Updated GPS icons and new status bar backgroundJustin Ho2010-10-146-0/+0
* | | | | | | | Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContac...Daniel Lehmann2010-10-143-3/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGE: Private API to pass the selected tab through QuickContactsDaniel Lehmann2010-10-143-3/+54
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Fix issue 3098850" into gingerbreadEric Laurent2010-10-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue 3098850Eric Laurent2010-10-141-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Screen on/off animation tweaks" into gingerbreadJoe Onorato2010-10-142-7/+38
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |