summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ebe661c4 to masterJae Seo2014-06-031-8/+8
|\
| * Put TV Input Framework under android.media.tv, including TvContractJae Seo2014-06-021-9/+8
| * Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-previ...Christopher Tate2014-05-281-0/+1
| |\
| | * DO NOT MERGE - Run the task manager service at startupChristopher Tate2014-05-231-0/+1
| * | Adding ITelecommService definition for Telecomm.Santos Cordon2014-05-281-0/+1
* | | Restrictions ManagerAmith Yamasani2014-05-311-0/+1
* | | Merge "Split frameworks/base using inclusion and exclusion rules."Jeff Brown2014-05-271-57/+11
|\ \ \
| * | | Split frameworks/base using inclusion and exclusion rules.Jeff Brown2014-05-231-57/+11
* | | | am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManager...Wonsik Kim2014-05-271-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Revert "Revert "Add physical TV input handling to TvInputManagerService""Wonsik Kim2014-05-271-0/+2
| | |/ | |/|
* | | Merge "Revert "Add physical TV input handling to TvInputManagerService""Guang Zhu2014-05-241-2/+0
|\ \ \
| * | | Revert "Add physical TV input handling to TvInputManagerService"Guang Zhu2014-05-241-2/+0
* | | | Merge "Add physical TV input handling to TvInputManagerService"Wonsik Kim2014-05-241-0/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Add physical TV input handling to TvInputManagerServiceWonsik Kim2014-05-231-0/+2
* | | Run the task manager service at startupChristopher Tate2014-05-231-0/+1
* | | am fe3a59cf: Merge "Add a cache to LockPatternUtils" into lmp-preview-devAdrian Roos2014-05-231-0/+1
|\ \ \ | |/ / |/| / | |/
| * Add a cache to LockPatternUtilsAdrian Roos2014-05-231-0/+1
* | Merge "Adding ITelecommService definition for Telecomm."Santos Cordon2014-05-221-0/+1
|\ \ | |/ |/|
| * Adding ITelecommService definition for Telecomm.Santos Cordon2014-05-211-0/+1
* | Move more packages to framework2Christoph Studer2014-05-221-2/+57
* | Merge "Add an EthernetManager."Lorenzo Colitti2014-05-221-0/+1
|\ \
| * | Add an EthernetManager.Lorenzo Colitti2014-05-211-0/+1
* | | Merge "Add feature actions for HDMI-CEC playback device"Jinsuk Kim2014-05-221-0/+1
|\ \ \
| * | | Add feature actions for HDMI-CEC playback deviceJinsuk Kim2014-05-221-0/+1
* | | | VolumeZen: SystemUI now hosts the volume dialog.John Spurlock2014-05-211-0/+1
|/ / /
* | | Hotspot 2.0 framework - add implementationRoger Chang2014-05-201-1/+1
|/ /
* | Revert "Adding INfcUnlockSettings and NfcUnlock interface class."Andres Morales2014-05-201-1/+0
|/
* Merge "Remove methods added in TelephonyManager."Santos Cordon2014-05-191-1/+0
|\
| * Remove methods added in TelephonyManager.Santos Cordon2014-05-161-1/+0
* | Merge "HdmiControlManager with HdmiPlaybackClient API definition"Jinsuk Kim2014-05-181-0/+2
|\ \
| * | HdmiControlManager with HdmiPlaybackClient API definitionJinsuk Kim2014-05-191-0/+2
| |/
* | Hotspot 2.0 framework APIs -- initial implementationYuhao Zheng2014-05-181-1/+1
|/
* 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
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-06-10 18:16:00 +0000