| commit | 1e10ba2183c32cc64f2b9a5d02083f9c46df0ba7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Aug 06 19:52:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 19:52:57 2015 +0000 |
| tree | 589a8f63329880477f89d28e0bb6738fd7d05932 | |
| parent | 2cca431d96475fbc62918188760ba1ad68722a36 [diff] | |
| parent | 1f149663b81a7cab81a896078c55d5ea6460d3bc [diff] |
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