| commit | 74a660136096d0ab10fe8d0f99c63ef535aa5552 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Dec 09 16:39:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 16:39:08 2014 +0000 |
| tree | f58d3a705c48e65829288fd5534151f00b0b6b72 | |
| parent | afc5b22c229b94228aa5ae1ff20117c9c76ba2ad [diff] | |
| parent | f71f5e8957aa2495a708ea1c8ca9e19d9e1f0003 [diff] |
am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." * commit 'f71f5e8957aa2495a708ea1c8ca9e19d9e1f0003': [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.