summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* Add RouteProviders to the new Media APIsRoboErik2014-04-171-5/+8
* Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-101-0/+2
|\
| * Adding render stats APIs to UiAutomation (framework).Svetoslav2014-04-071-0/+2
* | Merge "Launcher APIs and broadcasts for managed profiles"Amith Yamasani2014-04-081-0/+2
|\ \
| * | Launcher APIs and broadcasts for managed profilesAmith Yamasani2014-04-081-0/+2
| |/
* | Initial round of Television Input FrameworkJae Seo2014-04-081-0/+6
|/
* Define trust agent framework componentsAdrian Roos2014-03-311-0/+2
* Define initial trust agent APIAdrian Roos2014-03-311-0/+2
* Merge "Wifi hotspot stack initial hook up"Yuhao Zheng2014-03-281-0/+1
|\
| * Wifi hotspot stack initial hook upYuhao Zheng2014-03-251-0/+1
* | Expand install observer semanticsChristopher Tate2014-03-271-0/+1
* | Merge "Revert "Expand install observer semantics""Glenn Kasten2014-03-261-1/+0
|\ \
| * | Revert "Expand install observer semantics"Glenn Kasten2014-03-261-1/+0
* | | Merge "Expand install observer semantics"Christopher Tate2014-03-261-0/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Expand install observer semanticsChristopher Tate2014-03-251-0/+1
* | resolved conflicts for merge of 74fb97de to masterGabriel Peal2014-03-251-1/+28
|/
* resolved conflicts for merge of a67e34c8 to masterColin Cross2014-03-211-0/+2
|\
| * Add HDMI-CEC serviceJinsuk Kim2014-03-201-0/+2
* | Added accessibility APIs for introspecting interactive windows.Svetoslav2014-03-201-1/+1
* | Merge "Add removeApi commandline option for doclava and an empty removed.txt"Hui Shu2014-03-131-0/+1
|\ \
| * | Add removeApi commandline option for doclava and an empty removed.txtHui Shu2014-02-211-0/+1
* | | Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+1
* | | Move Session apis to android.media.sessionRoboErik2014-02-251-5/+5
* | | resolved conflicts for merge of baaa080b to masterJeff Brown2014-02-201-0/+1
|\ \ \ | | |/ | |/|
| * | Add a new "doze mode" based on Dream components.Jeff Brown2014-02-201-0/+1
* | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-201-0/+5
|\ \ \
| * | | Initial round of MediaSession APIsRoboErik2014-02-191-0/+5
* | | | Delete Third Party Call APIsSailesh Nepal2014-02-181-3/+0
|/ / /
* | | am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49:...Dirk Dougherty2014-02-131-0/+2
|\ \ \ | |/ / | | / | |/ |/|
| * am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups...Dirk Dougherty2014-02-131-0/+2
| |\
| | * am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing ...Dirk Dougherty2014-02-131-0/+2
| | |\
| | | * am 35cb4e49: Doc change: add new samples TOC groups and landing pages.Dirk Dougherty2014-02-131-0/+2
| | | |\
| | | | * Doc change: add new samples TOC groups and landing pages.Dirk Dougherty2014-02-121-0/+2
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-051-0/+2
|\ \ \ \ \
| * | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-0/+2
* | | | | | Introduce "IdleService" API to expose idle-time maintenance to appsChristopher Tate2014-01-311-0/+2
|/ / / / /
* | | | | Adding the print and accessibility pacelables to framework.aidlSvetoslav Ganov2014-01-281-0/+10
* | | | | resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-191-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Pair ActivityStacks with DisplaysCraig Mautner2013-12-181-0/+2
| |/ / /
| * | | am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer f...Ying Wang2013-12-051-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
* | | | Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-091-0/+1
* | | | libcore_to_document and junit_to_document are no longer functions.Ying Wang2013-12-041-2/+2
* | | | am 713e3853: am 0b492138: am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
|\ \ \ \ | |/ / /
| * | | am 6000f1ed: Re-enable samples browser.Dirk Dougherty2013-11-231-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Re-enable samples browser.Dirk Dougherty2013-11-221-4/+4
* | | | am a6703462: am a0501105: am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
|\ \ \ \ | |/ / /
| * | | am 9eaa9443: Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
| |\ \ \ | | |/ /
| | * | Disable samples browsing temporarily.Dirk Dougherty2013-11-221-4/+4
* | | | am 3ee2c60e: am 8b5da356: am 1448d3cd: Merge "Pass a new samplesdir param to ...Dirk Dougherty2013-11-221-162/+4
|\ \ \ \ | |/ / /