tree d81ded4543fce46d4dad39562f97248a220609ec
parent 42621023cfac084b8c74fd4d362bc2c64d61674e
parent 970e3f412d34cbeae3706de5cb1de0b3ca741f87
author Dianne Hackborn <hackbod@google.com> 1464809167 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464809169 +0000

Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev