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:
6c591dd
889c0c0
)
Merge "Fix NPE in ActivityThread" into oc-mr1-dev am: 348b13f597
author
Clara Bayarri
<clarabayarri@google.com>
Wed, 4 Oct 2017 13:00:52 +0000
(13:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 4 Oct 2017 13:00:52 +0000
(13:00 +0000)
am:
889c0c0f12
Change-Id: I93b731cd4a52828e1c3d00018d4c095ab0e508a3
1
2
core/java/android/app/ActivityThread.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/ActivityThread.java
Simple merge