summaryrefslogtreecommitdiffstats
path: root/services/core/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* fw: Move proximitycheck to CMSettings.Adnan Begovic2015-11-091-1/+1
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-1/+1
|\
| * ConnectivityManager API for for packet keepalives.Lorenzo Colitti2015-07-181-1/+1
* | livedisplay: Implement active display adjustmentSteve Kondik2015-10-181-0/+4
|/
* resolved conflicts for merge of 962a11ad to masterNeil Fuller2015-03-311-0/+1
|\
| * An updater for all timezone data on a deviceNeil Fuller2015-03-261-0/+1
* | Split up android.policy into framework.jar and services.jar 1/3Jorim Jaggi2015-02-101-1/+1
|/
* Check feature bits before loading optional servicesAdam Lesinski2014-02-051-0/+14