summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* Merge "Initial support for split APKs, PackageInstaller."Jeff Sharkey2014-05-151-0/+2
|\
| * Initial support for split APKs, PackageInstaller.Jeff Sharkey2014-05-141-0/+2
* | Merge "Adding method for applications to query their own tasks. (Bug 14627210)"Winson Chung2014-05-151-0/+1
|\ \ | |/ |/|
| * Adding method for applications to query their own tasks. (Bug 14627210)Winson Chung2014-05-141-0/+1
* | am 60549e20: Merge "Usage stats!"Dianne Hackborn2014-05-081-2/+2
|\ \ | |/
| * Usage stats!Dianne Hackborn2014-05-081-2/+2
* | am c5fe3c17: Merge "Initial implementation of WifiScanner"Vinit Deshapnde2014-05-081-0/+1
|\ \ | |/
| * Initial implementation of WifiScannerVinit Deshapnde2014-05-071-0/+1
* | am 68dca221: Merge "Check doc comments when you run update-api."Ying Wang2014-05-071-1/+2
|\ \ | |/
| * Check doc comments when you run update-api.Ying Wang2014-05-071-1/+2
* | am d031e36c: First pass at adding FingerprintManagerServiceJim Miller2014-05-071-0/+2
|\ \ | |/
| * First pass at adding FingerprintManagerServiceJim Miller2014-05-071-0/+2
* | am 89094f50: Merge "Make GET_TASKS signature|system."Dianne Hackborn2014-05-021-1/+0
|\ \ | |/
| * Make GET_TASKS signature|system.Dianne Hackborn2014-05-021-1/+0
* | am 9e35d785: Merge "API for network cache subsystems."Jeff Davidson2014-05-021-0/+1
|\ \ | |/
| * Merge "API for network cache subsystems."Jeff Davidson2014-05-021-0/+1
| |\
| | * API for network cache subsystems.Jeff Davidson2014-04-301-0/+1
* | | am a54edd7e: Merge "TaskManager API first pass."Matthew Williams2014-05-011-0/+2
|\ \ \ | |/ /
| * | Merge "TaskManager API first pass."Matthew Williams2014-05-011-0/+2
| |\ \ | | |/ | |/|
| | * TaskManager API first pass.Matthew Williams2014-04-211-0/+2
* | | 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
|\ \ \ | |/ /