OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9539b4a 54d5702)
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)
Conflicts:
services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help