| commit | dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Aug 06 19:20:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 19:20:38 2015 +0000 |
| tree | 1a26be7f5ece4bc3cb94d5c988791235637c120e | |
| parent | 8695ec34cf0460ec7687b578475d71c4c09cb773 [diff] | |
| parent | 339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4 [diff] |
am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit '339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4': Use realActivity as indicator for task locking