OSDN Git Service

Merge changes I6993325b,Icb5114fe
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 8 Feb 2018 23:32:03 +0000 (23:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Feb 2018 23:32:03 +0000 (23:32 +0000)
commit40279e54075e0f104ff484d094148f63b59e19cd
treeeda14d7ae89a60c54ba95e5b6e3ec0fd7d2fd80c
parent6c78b876e7e9c12690800bec1c4684c56a51548a
parenta36dc621ef0b86a0bd46f1d4f5a719a466ba1800
Merge changes I6993325b,Icb5114fe

* changes:
  Frameworks: Annotate trivial @GuardedBy in services/core
  Frameworks: Annotate trivial @GuardedBy in core/java
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/notification/NotificationManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/stats/StatsCompanionService.java