OSDN Git Service

Merge commit '54d5702c' into manualmerge
authorCraig Mautner <cmautner@google.com>
Fri, 14 Mar 2014 23:49:50 +0000 (16:49 -0700)
committerCraig Mautner <cmautner@google.com>
Fri, 14 Mar 2014 23:49:50 +0000 (16:49 -0700)
commitca0aba399326886d1a39c2344bab296044ba5eb0
tree75555abdc247774b9768e43ba1d93fe09a509960
parent9539b4a02f74b447db0e3aa1039229f6b913aa87
parent54d5702cf8e5e7d9fe5794f93b90b6f678ac27bb
Merge commit '54d5702c' into manualmerge

Conflicts:
services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe