OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2bf7245
8bffdc2
)
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
author
Fan Zhang
<zhfan@google.com>
Tue, 31 Oct 2017 22:50:43 +0000
(22:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 31 Oct 2017 22:50:43 +0000
(22:50 +0000)
am:
8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
1
2
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
Simple merge