OSDN Git Service

Merge "Account info on job wakelocks" into nyc-dev
authorShreyas Basarge <snb@google.com>
Tue, 26 Apr 2016 22:36:45 +0000 (22:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Apr 2016 22:36:47 +0000 (22:36 +0000)
commit8fcf6a692262dc182c844b35337b67aeb320021d
tree962b46273359da2b65ee138039591d33a529f6d1
parentf84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1
parenteda34e4d9687d1205d9491a33fdb62dbb7f27d07
Merge "Account info on job wakelocks" into nyc-dev
services/core/java/com/android/server/content/SyncManager.java
services/core/java/com/android/server/job/controllers/JobStatus.java