tree b1dfa69e44fcd638e587b56f4e90af17852addca
parent 7828cbf0e18f90b43584574aa5bbcd7cd4e4ee0f
parent cbcd656910a1b1c0377906f959e6c3667e87abed
author Dianne Hackborn <hackbod@google.com> 1503968281 +0000
committer android-build-merger <android-build-merger@google.com> 1503968281 +0000

Merge "Rework wake lock handling of JobIntentService" into oc-support-26.0-dev
am: cbcd656910

Change-Id: I0689767d1bf63075f6d9c692884b66d4e79064d7