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:
bf7fe1e
09d57fe
)
Merge "Add new API to set URI on AssistContent." into mnc-dev
author
Dianne Hackborn
<hackbod@google.com>
Thu, 28 May 2015 21:35:40 +0000
(21:35 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 28 May 2015 21:35:41 +0000
(21:35 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-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
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge