summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/TwilightCalculator.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-021-8/+7
* Move some system services to separate directoriesAmith Yamasani2013-12-191-0/+123