| commit | 7611a5d32889f54b1763cf076a442a0575c69b51 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Jul 07 15:00:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 15:00:47 2014 +0000 |
| tree | 8ca1c593803215d124bec53152b1fcfe3dd052b5 | |
| parent | e0849423214007d4377638fb42db15276e3ca575 [diff] | |
| parent | 5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec [diff] |
am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." * commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec': [ActivityManager] Ensure alive process is not killedByAm.