| commit | 4e3ea657707e8b0dbd55505ca765803aeda640b9 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Wed Jul 16 09:12:55 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Wed Jul 16 09:12:55 2014 -0700 |
| tree | c3d3363283b512065d279cc948491712375b259a | |
| parent | e36542faa6030760853a958a32ebc3c0e5ec983b [diff] | |
| parent | 3eb3b1d66a163d0978670b8d205bc8b4d436f9dd [diff] |
Merge commit '3eb3b1d6' into manualmerge Conflicts: services/java/com/android/server/am/ActivityStackSupervisor.java Change-Id: Id0446df9463980b3348d1e151992b14c5d9b6cfa