158b2129cf
Merge commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02' * commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02': location: Location Manager wakelock cleanup