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:
147966d
512e5d1
)
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
author
Bryce Lee
<brycelee@google.com>
Wed, 26 Jul 2017 16:25:40 +0000
(16:25 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 26 Jul 2017 16:25:40 +0000
(16:25 +0000)
am:
512e5d1b9b
Change-Id: If5c2ce81a92d751c3481d7613611b9373060f78a
1
2
core/java/android/content/pm/ActivityInfo.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/pm/ActivityInfo.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityRecord.java
Simple merge