summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Some cleanupAlex Sakhartchouk2010-10-185-48/+6
* am 20856f71: am c9f7890a: Revise some javadocs for NFC; add package descriptionScott Main2010-10-188-68/+104
|\
| * am c9f7890a: Revise some javadocs for NFC; add package descriptionScott Main2010-10-158-68/+104
| |\
| | * Revise some javadocs for NFC; add package descriptionScott Main2010-10-158-68/+104
* | | am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-180-0/+0
|\ \ \ | |/ /
| * | am 7ef6834e: Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-0/+8
| |\ \ | | |/
| | * Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-0/+8
| | |\
| | | * DO NOT MERGEShimeng (Simon) Wang2010-10-151-0/+8
* | | | Fix build (bad merge)Jean-Baptiste Queru2010-10-181-1/+1
* | | | Remove one more opencore include pathJean-Baptiste Queru2010-10-181-1/+1
* | | | Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-1817-20/+23
|\ \ \ \ | |/ / /
| * | | am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead...Andreas Huber2010-10-1517-20/+23
| |\ \ \ | | |/ /
| | * | 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
* | | | | am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX he...Andreas Huber2010-10-1810-0/+6937
|\ \ \ \ \ | |/ / / /
| * | | | am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerl...Andreas Huber2010-10-1510-0/+6937
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to ...Dianne Hackborn2010-10-1811-9/+52
|\ \ \ \ \ | |/ / / /
| * | | | am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UI...Dianne Hackborn2010-10-1511-9/+52
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | | am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into ginge...Irfan Sheriff2010-10-180-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbreadIrfan Sheriff2010-10-151-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "fix build DO NOT MERGE" into gingerbreadIrfan Sheriff2010-10-151-1/+1
| | |\ \ \ \
| | | * | | | fix build DO NOT MERGEIrfan Sheriff2010-10-151-1/+1
* | | | | | | am e35cd5f5: (-s ours) am 73dbdc35: Merge "DO NOT MERGE - Updated media trans...Justin Ho2010-10-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and...Justin Ho2010-10-154-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
* | | | | | | am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 31e4d66a: Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-1/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-1/+5
| | |\ \ \ \ \
| | | * | | | | DO NOT MERGEShimeng (Simon) Wang2010-10-151-1/+5
* | | | | | | | resolved conflicts for merge of 46ca6a22 to masterLeon Scroggins2010-10-181-11/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 36cb18cf: Merge "Line up textfield with WebTextView more often." into ging...Leon Scroggins2010-10-151-10/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
* | | | | | | | | am cf054d1c: (-s ours) am f8834f87: Merge "fetch macaddr right after supplica...Irfan Sheriff2010-10-170-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f8834f87: Merge "fetch macaddr right after supplicant connection" into gin...Irfan Sheriff2010-10-151-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
* | | | | | | | | NFC: Move NFC service implementation out of system_server.Nick Pelly2010-10-1719-3012/+344
* | | | | | | | | am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev gui...Scott Main2010-10-172-8/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in pa...Scott Main2010-10-152-8/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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 b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7f3addf3: am 09da9609: docs: fix code snippet errorsScott Main2010-10-151-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /