summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" in...Jason Monk2013-09-131-0/+2
|\
| * Merge "Guarantee that PAC Local Proxy owns Port" into klp-devJason Monk2013-09-131-0/+2
| |\
| | * Guarantee that PAC Local Proxy owns PortJason Monk2013-09-131-0/+2
* | | am bf142e6b: am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass ...Dirk Dougherty2013-09-121-1/+9
|\ \ \ | |/ /
| * | am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups...Dirk Dougherty2013-09-121-1/+9
| |\ \
| | * \ am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava."...Dirk Dougherty2013-09-121-1/+9
| | |\ \
| | | * | Pass whitelist of sample groups to doclava.Dirk Dougherty2013-09-121-1/+9
* | | | | am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-devAlexander Ray2013-09-111-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add consumer IR framework" into klp-devAlexander Ray2013-09-111-0/+1
| |\ \ \ \
| | * | | | Add consumer IR frameworkErik Gilling2013-09-111-0/+1
| | | |_|/ | | |/| |
* | | | | am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-devSandeep Siddhartha2013-09-111-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove HotwordRecognition APIsSandeep Siddhartha2013-09-111-2/+0
| |/ / /
* | | | Fix broken javadocsMatthew Williams2013-09-051-1/+1
* | | | am 03e5039a: am 2069b004: am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a...Dirk Dougherty2013-09-041-3/+8
|\ \ \ \ | |/ / /
| * | | am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to brows...Dirk Dougherty2013-09-041-3/+8
| |\ \ \ | | |/ /
| | * | am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-...Dirk Dougherty2013-09-041-3/+8
| | |\ \ | | | |/
| | | * Add a few more samples to browser.Dirk Dougherty2013-09-041-3/+8
* | | | am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model....Martijn Coenen2013-09-031-1/+1
|\ \ \ \ | |/ / /
| * | | Reader mode NFC API: move to callback model.Martijn Coenen2013-09-021-1/+1
* | | | am f7a7a636: am b0a17400: Merge "Add Service API to perform Hotword recogniti...Sandeep Siddhartha2013-08-271-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Add Service API to perform Hotword recognition" into klp-devSandeep Siddhartha2013-08-271-0/+2
| |\ \ \
| | * | | Add Service API to perform Hotword recognitionSandeep Siddhartha2013-08-261-0/+2
* | | | | am e0612ffe: am 826debf5: Merge "Print UI bug fixing and printer discovery re...Svetoslav Ganov2013-08-261-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Print UI bug fixing and printer discovery refactoring.Svetoslav Ganov2013-08-231-0/+1
* | | | | am 1063698a: am e9a0601e: am 978ec174: am de525b44: am 2a4f71df: Merge "Tempo...Dirk Dougherty2013-08-221-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 978ec174: am de525b44: am 2a4f71df: Merge "Temporarily disable sample code...Dirk Dougherty2013-08-221-4/+4
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generat...Dirk Dougherty2013-08-221-4/+4
| | |\ \ | | | |/
| | | * Temporarily disable sample code html generation in docs builds.Dirk Dougherty2013-08-211-4/+4
* | | | am a9e12e03: am ff796e5a: Merge "Change PacProcessor to Android Service" into...Jason Monk2013-08-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Change PacProcessor to Android Service" into klp-devJason Monk2013-08-201-1/+1
| |\ \ \
| | * | | Change PacProcessor to Android ServiceJason Monk2013-08-201-1/+1
* | | | | am be88e35d: am d3092167: Merge "Implemented advanced printer selection and A...Svetoslav2013-08-201-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Implemented advanced printer selection and API refactoring." into klp-devSvetoslav2013-08-201-2/+0
| |\ \ \ \
| | * | | | Implemented advanced printer selection and API refactoring.Svetoslav2013-08-191-2/+0
| | |/ / /
* | | | | am 9c057eb6: am cb13399c: am 2d9ee707: am 364fe3a8: am b6bc020d: doc change: ...Dirk Dougherty2013-08-191-94/+93
|\ \ \ \ \ | |/ / / /
| * | | | am 2d9ee707: am 364fe3a8: am b6bc020d: doc change: Samples browsing first cha...Dirk Dougherty2013-08-191-94/+93
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples...Dirk Dougherty2013-08-191-94/+93
| | |\ \ | | | |/
| | | * doc change: Samples browsing first changes: Samples dir and file starters.Dirk Dougherty2013-08-191-94/+93
* | | | Run rmtypedefs on framework.jar.Ying Wang2013-08-141-1/+1
|/ / /
* | | Merge "Add support in the platform for Flp Geofencing." into klp-devdestradaa2013-08-131-0/+1
|\ \ \
| * | | Add support in the platform for Flp Geofencing.destradaa2013-08-131-0/+1
* | | | Merge "Add support for batched wifi scans." into klp-devRobert Greenwalt2013-08-131-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for batched wifi scans.Robert Greenwalt2013-08-131-0/+2
* | | | Merge "Refinement of the print service APIs." into klp-devSvetoslav Ganov2013-08-111-1/+2
|\ \ \ \
| * | | | Refinement of the print service APIs.Svetoslav Ganov2013-08-111-1/+2
* | | | | Bluetooth MAP profile - sms and mms support initial check-inMatthew Xie2013-08-091-0/+1
|/ / / /
* | | | Add FlpHal layer to support Location Batching.destradaa2013-08-081-0/+5
|/ / /
* | | Add PAC File support for proxy configurationJason Monk2013-08-071-1/+2
* | | Start adding IPC calls to retrieve proc stat data.Dianne Hackborn2013-08-071-0/+1
* | | Merge "NFC: Host-based card emulation APIs."Martijn Coenen2013-08-031-0/+1
|\ \ \