summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-051-17/+80
|\
| * am d40a4d74: Merge "Add media router service and integrate with remote displa...Jeff Brown2013-11-071-0/+2
| |\
| | * Merge "Add media router service and integrate with remote displays." into klp...Jeff Brown2013-11-081-0/+2
| | |\
| | | * Add media router service and integrate with remote displays.Jeff Brown2013-11-071-0/+2
| * | | am 1f7a8a06: Merge "Add a platform library for remote display providers." int...Jeff Brown2013-11-071-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-081-0/+2
| | |\ \ | | | |/
| | | * Add a platform library for remote display providers.Jeff Brown2013-11-071-0/+2
| | * | Enable samples browsing in builds.Dirk Dougherty2013-10-301-4/+6
| * | | fix buildScott Main2013-11-011-1/+1
| * | | add storage provider sample to buildScott Main2013-11-011-3/+3
| * | | Enable samples browsing in builds.Dirk Dougherty2013-10-311-4/+6
| |/ /
| * | Doc change: add new list of browseable samples and sample groups.Dirk Dougherty2013-10-291-15/+71
| |/
| * Hide the print dialog if the printing activity is destroyed.Svetoslav Ganov2013-10-181-0/+1
* | libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
|/
* Refactor how the print dialog activity is started.Svetoslav2013-10-111-1/+0
* update version number for doc stampScott Main2013-10-041-1/+1
* add -since flag for api level 19 to filter javadocsScott Main2013-10-031-0/+1
* Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-09-301-0/+1
|\
| * Add android.provider.Telephony to public API.Jake Hamby2013-09-241-0/+1
* | Adding hidden APIs for observing the print jobs state.Svetoslav Ganov2013-09-251-0/+1
|/
* 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 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
* | | | Merge "Add consumer IR framework" into klp-devAlexander Ray2013-09-111-0/+1
|\ \ \ \
| * | | | Add consumer IR frameworkErik Gilling2013-09-111-0/+1
| | |_|/ | |/| |
* | | | Remove HotwordRecognition APIsSandeep Siddhartha2013-09-111-2/+0
|/ / /
* | | 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
* | | Reader mode NFC API: move to callback model.Martijn Coenen2013-09-021-1/+1
* | | 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
* | | | Print UI bug fixing and printer discovery refactoring.Svetoslav Ganov2013-08-231-0/+1
* | | | 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
* | | Merge "Change PacProcessor to Android Service" into klp-devJason Monk2013-08-201-1/+1
|\ \ \
| * | | Change PacProcessor to Android ServiceJason Monk2013-08-201-1/+1
* | | | 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 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
* | | 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
|\ \ \ \