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:
05d1841
792d36c
)
Merge "Allow only selected priv apps to run OOB" into pi-dev
author
Victor Hsieh
<victorhsieh@google.com>
Wed, 9 May 2018 19:37:38 +0000
(12:37 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 9 May 2018 19:37:38 +0000
(12:37 -0700)
am:
792d36c170
Change-Id: Iad80a321e1b76f19935a23290594a36fd057840c
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
core/tests/coretests/src/android/provider/SettingsBackupTest.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
