summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am c60f1877: Merge "Rework some of the voice interaction APIs."Dianne Hackborn2014-04-281-0/+1
|\
| * Rework some of the voice interaction APIs.Dianne Hackborn2014-04-281-0/+1
* | am c1644c59: Wire up condition providers to zen mode exit triggers.John Spurlock2014-04-271-0/+1
|\ \ | |/
| * Wire up condition providers to zen mode exit triggers.John Spurlock2014-04-271-0/+1
* | am 7745fb9e: Merge "Introduce condition provider services."John Spurlock2014-04-251-0/+1
|\ \ | |/
| * Merge "Introduce condition provider services."John Spurlock2014-04-251-0/+1
| |\
| | * Introduce condition provider services.John Spurlock2014-04-251-0/+1
* | | am ed407e04: Merge "Initial implementation of new voice interaction API."Dianne Hackborn2014-04-251-0/+6
|\ \ \ | |/ /
| * | Initial implementation of new voice interaction API.Dianne Hackborn2014-04-241-0/+6
| |/
* | am 2ca3962b: Merge "Initial implementation of NetworkScoreManager\'s backing ...Jeff Davidson2014-04-221-0/+1
|\ \ | |/
| * Initial implementation of NetworkScoreManager's backing service.Jeff Davidson2014-04-211-0/+1
* | resolved conflicts for merge of 0a57a111 to master-novaRoboErik2014-04-171-5/+8
|\ \ | |/
| * Add RouteProviders to the new Media APIsRoboErik2014-04-171-5/+8
* | am 6be2f952: Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-101-0/+2
|\ \ | |/
| * 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
* | | am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"Amith Yamasani2014-04-091-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
| | |/
* | | am 3957091b: Initial round of Television Input FrameworkJae Seo2014-04-081-0/+6
|\ \ \ | |/ /
| * | Initial round of Television Input FrameworkJae Seo2014-04-081-0/+6
| |/
* | Add CallServiceSelectorAdapterSailesh Nepal2014-04-011-2/+1
* | am 53ab5174: Merge "Define trust agent framework components"Adrian Roos2014-03-311-0/+2
|\ \ | |/
| * Define trust agent framework componentsAdrian Roos2014-03-311-0/+2
* | am 716f20d8: Merge "Define initial trust agent API"Adrian Roos2014-03-311-0/+2
|\ \ | |/
| * Define initial trust agent APIAdrian Roos2014-03-311-0/+2
* | am 93627ac8: Merge "Wifi hotspot stack initial hook up"Yuhao Zheng2014-03-281-0/+1
|\ \ | |/
| * Merge "Wifi hotspot stack initial hook up"Yuhao Zheng2014-03-281-0/+1
| |\
| | * Wifi hotspot stack initial hook upYuhao Zheng2014-03-251-0/+1
* | | am 5454ac6b: Merge "Expand install observer semantics"Christopher Tate2014-03-271-0/+1
|\ \ \ | |/ /
| * | Expand install observer semanticsChristopher Tate2014-03-271-0/+1
* | | am 1ee4eb07: Merge "Revert "Expand install observer semantics""Glenn Kasten2014-03-261-1/+0
|\ \ \ | |/ /
| * | Merge "Revert "Expand install observer semantics""Glenn Kasten2014-03-261-1/+0
| |\ \
| | * | Revert "Expand install observer semantics"Glenn Kasten2014-03-261-1/+0
* | | | am 9067dc03: Merge "Expand install observer semantics"Christopher Tate2014-03-261-0/+1
|\ \ \ \ | |/ / /
| * | | 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 2d72d000 to master-novaSailesh Nepal2014-03-251-1/+28
|\ \ \ | |/ /
| * | resolved conflicts for merge of 74fb97de to masterGabriel Peal2014-03-251-1/+28
| |/
* | am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master"Colin Cross2014-03-211-0/+2
|\ \ | |/
| * resolved conflicts for merge of a67e34c8 to masterColin Cross2014-03-211-0/+2
| |\
| | * Add HDMI-CEC serviceJinsuk Kim2014-03-201-0/+2
* | | am 8e3feb15: Added accessibility APIs for introspecting interactive windows.Svetoslav2014-03-201-1/+1
|\ \ \ | |/ /
| * | Added accessibility APIs for introspecting interactive windows.Svetoslav2014-03-201-1/+1
* | | am 57ad97fb: Merge "Add removeApi commandline option for doclava and an empty...Hui Shu2014-03-131-0/+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
* | | | Add wrappers around telecomm interfacesSailesh Nepal2014-03-111-9/+9
* | | | am 77b987f1: Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+1
|\ \ \ \ | |/ / /
| * | | Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+1