| commit | 1f149663b81a7cab81a896078c55d5ea6460d3bc | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Aug 06 19:41:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 19:41:46 2015 +0000 |
| tree | d2ff4fd8624f06e956759741b7b5c9dde968f905 | |
| parent | 26dbbcc555bd9d70474b88c4fde4cc5ddf8b8cb9 [diff] | |
| parent | f7a2eb5a8a183963b4d4e2bf8f5c3c21b01914cc [diff] |
am f7a2eb5a: am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev * commit 'f7a2eb5a8a183963b4d4e2bf8f5c3c21b01914cc': Use realActivity as indicator for task locking