| commit | 17fcc01c33fae16c9fca77ea8c0a696986563a3f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Jul 07 15:12:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 15:12:18 2014 +0000 |
| tree | abcda79715e89f9d298ed28a5153f49a2a935263 | |
| parent | 30d5195fc1bb6f13e1b294cc3cbec9ef5837ed8d [diff] | |
| parent | 53cc7d7998a9a656fe89ec8eba40ad479bded274 [diff] |
am 53cc7d79: am 7611a5d3: am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." * commit '53cc7d7998a9a656fe89ec8eba40ad479bded274': [ActivityManager] Ensure alive process is not killedByAm.