Commits
Mitchell Wills authored and Android Git Automerger committed 500dd6c31eaM
am bb4fd900: (-s ours) am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev * commit 'bb4fd9009e0cf91ba68ca0192486045843658e7e':
Showing diff to08e05b351ee