Commits
Benjamin Franz authored and Android Git Automerger committed 8154107da13M
am dfa85910: (-s ours) am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit 'dfa8591068a7f7899298da229fb6dea6585a2737':
Showing diff tod3888536778