| commit | 4c07d0246fb37e6a77be2c5cdcdf55a989b90f75 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Wed Jun 11 17:12:59 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Wed Jun 11 17:12:59 2014 -0700 |
| tree | 9c990a733d768f5cd3abe338be7226268d12f195 | |
| parent | 069438d3febd8488db3f4ff23ce7da5ce68c328e [diff] | |
| parent | f5030ecbca4f8dc217204d96d3f0a3511acf49ac [diff] |
Merge commit 'f5030ecb' into manualmerge Conflicts: services/core/java/com/android/server/am/ActivityStack.java services/core/java/com/android/server/am/ActivityStackSupervisor.java Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5