tree 35e339a557d86abc6b3233818723303f8270d843
parent f8c511e5336325ec48ab7a8e0e2a284a8f4ac42f
parent d02ff5c0666de0444fe74ad41c1b969b959f8343
author Android Build Merger (Role) <android-build-merger@google.com> 1481743848 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481743852 +0000

Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a" into nyc-mr2-dev-plus-aosp