OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5807021
b6a2573
)
Merge "Show warning when app was compiled against incompatible preview SDK"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Wed, 22 Nov 2017 15:54:05 +0000
(15:54 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 22 Nov 2017 15:54:05 +0000
(15:54 +0000)
1
2
core/res/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/strings.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
OSDN Git Service
