OSDN Git Service

Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 1 Jun 2016 23:13:22 +0000 (23:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jun 2016 23:13:23 +0000 (23:13 +0000)

Trivial merge