Commits
Benjamin Franz authored and Android Git Automerger committed 1e10ba2183cM
am 1f149663: am f7a2eb5a: am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit '1f149663b81a7cab81a896078c55d5ea6460d3bc': Use realActivity as indicator for task locking
Showing diff to2cca431d964