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:
c8aa7f9
7bc1db9
)
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef
author
Fyodor Kupolov
<fkupolov@google.com>
Wed, 22 Jun 2016 22:47:46 +0000
(22:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 Jun 2016 22:47:46 +0000
(22:47 +0000)
am:
7bc1db96ed
Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4
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