| commit | aa9b0f15753541ff8e4d62e6497c11800c737077 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Jul 17 10:50:18 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Jul 17 10:50:18 2014 -0700 |
| tree | 4a216051483408ff64757dc8ede35e4ed8abd0ad | |
| parent | 738177caf6a755a59ca6b17bb968be0aa4e8e10f [diff] | |
| parent | 0a93106964eec2462ec86e372def1b0d1526cd7d [diff] |
resolved conflicts for merge of 0a931069 to lmp-dev Conflicts: services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/am/ActivityStackSupervisor.java Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22