| commit | ca0aba399326886d1a39c2344bab296044ba5eb0 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Mar 14 16:49:50 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Fri Mar 14 16:49:50 2014 -0700 |
| tree | 75555abdc247774b9768e43ba1d93fe09a509960 | |
| parent | 9539b4a02f74b447db0e3aa1039229f6b913aa87 [diff] | |
| parent | 54d5702cf8e5e7d9fe5794f93b90b6f678ac27bb [diff] |
Merge commit '54d5702c' into manualmerge Conflicts: services/core/java/com/android/server/am/TaskRecord.java Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe