| commit | 53cc7d7998a9a656fe89ec8eba40ad479bded274 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Jul 07 15:06:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 15:06:41 2014 +0000 |
| tree | aa9e5bdc44c200ab2adcabc75293cbb082bb62be | |
| parent | 10eb3b0665dd7c636af5f0d657512c1a2e309e0c [diff] | |
| parent | 7611a5d32889f54b1763cf076a442a0575c69b51 [diff] |
am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." * commit '7611a5d32889f54b1763cf076a442a0575c69b51': [ActivityManager] Ensure alive process is not killedByAm.