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:
1ca3ddb
da71e10
)
am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
author
Dianne Hackborn
<hackbod@google.com>
Thu, 28 May 2015 22:35:39 +0000
(22:35 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 28 May 2015 22:35:39 +0000
(22:35 +0000)
* commit '
da71e1004082427e36db21c39f47b13e0afa8ed4
':
Add new API to set URI on AssistContent.
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge