| commit | 4377086f9412ab61f67907e9f1d487a45def5ac5 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Mar 28 23:40:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 28 23:40:27 2014 +0000 |
| tree | 3a657c2dd21f7e60affd1c3f032ef9b596d410d3 | |
| parent | 6f9bddc846e2915d1b1db2310a785be8ab7c91a6 [diff] | |
| parent | 9c99c55d03a66ad5ba47584340c527c0f843bbe8 [diff] |
am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." * commit '9c99c55d03a66ad5ba47584340c527c0f843bbe8': DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.