| commit | f7a2eb5a8a183963b4d4e2bf8f5c3c21b01914cc | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Aug 06 19:32:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 19:32:43 2015 +0000 |
| tree | f16b9969e99e95da38b610341337e21f919cb133 | |
| parent | 37a8bf6141d67d7d7fd216e612563eff056fbe0c [diff] | |
| parent | a17c5bac6efff8365c1f2019311778413598e37c [diff] |
am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit 'a17c5bac6efff8365c1f2019311778413598e37c': Use realActivity as indicator for task locking