Adam Lesinski 881f6f9266 resolve merge conflicts of 551fc6823a to master. ...

Change-Id: I2778bf2a364c103fc0d351f2afc4fc73bede2f19

2016-01-12 16:41:48 -08:00

..

AppIdleHistory.java

Report app standby state to batterystats

2015-06-12 09:05:22 -07:00

IntervalStats.java

Fix negative inactiveTime on creating a new user

2015-06-12 16:35:17 -07:00

UnixCalendar.java

UsageStats: Fix time change handling

2015-09-15 17:40:01 +00:00

UsageStatsDatabase.java

UsageStats: Fix time change handling

2015-09-15 17:40:01 +00:00

UsageStatsService.java

Even more PackageManager caller triage.

2016-01-08 18:35:54 -07:00

UsageStatsXml.java

UsageStats: Gracefully handle corrupt filenames

2015-07-22 16:01:45 -07:00

UsageStatsXmlV1.java

UsageStats: Change INTERACTION to SYSTEM_INTERACTION

2015-06-11 22:01:45 +00:00

UserUsageStatsService.java

resolve merge conflicts of 551fc6823a to master.

2016-01-12 16:41:48 -08:00