OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cddef3 8d7b182)
resolve merge conflicts of 8d7b18292b63 to master
authorTim Murray <timmurray@google.com>
Thu, 12 Jan 2017 01:13:44 +0000 (17:13 -0800)
committerTim Murray <timmurray@google.com>
Thu, 12 Jan 2017 01:13:44 +0000 (17:13 -0800)
commit6853e0dcb435090977aae886c2018c29dfb04d50
tree6348e1a00668b300451a46165a94fc53e87f2317tree | snapshot
parent2cddef3329c751262e9783f760c1761972278272commit | diff
parent8d7b18292b63d51c09edf32d57b16fc3f8a03eedcommit | diff
resolve merge conflicts of 8d7b18292b63 to master

Change-Id: Id59ab691bfdb98cff179dfa23e3ddb185e646f53
services/core/java/com/android/server/am/ActivityManagerService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help