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:
5184e5d
fb5840b
)
Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into...
author
Dianne Hackborn
<hackbod@google.com>
Fri, 28 Apr 2017 22:44:35 +0000
(22:44 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 28 Apr 2017 22:44:35 +0000
(22:44 +0000)
am:
fb5840b0e6
Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/test-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
api/system-current.txt
Simple merge
diff --cc
api/test-current.txt
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge