| commit | a00ed7f7255b7bd9ac897166bcce03da2f05c4a7 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Apr 09 14:03:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 09 14:03:47 2014 +0000 |
| tree | db11fe11780d567a68d88b43203e53446ce4e28e | |
| parent | 931ec9861d139e401d511b84bdeef3a3f7acda66 [diff] | |
| parent | a981e3b01ae6af2b67e582f0d1cbb95560d05626 [diff] |
am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp * commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626': Move certain internal activity manager methods to new class.