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:
089d161
7870850
)
am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm...
author
Amith Yamasani
<yamasani@google.com>
Fri, 27 Sep 2013 18:14:30 +0000
(11:14 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 27 Sep 2013 18:14:30 +0000
(11:14 -0700)
* commit '
7870850387dabd32a54e3fca7d65dea5f45a9a16
':
Make sure that external callers cannot pass in the confirm bypass extra
1
2
AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/ChooseLockGeneric.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/ChooseLockPassword.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/ChooseLockPattern.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
AndroidManifest.xml
Simple merge
diff --cc
src/com/android/settings/ChooseLockGeneric.java
Simple merge
diff --cc
src/com/android/settings/ChooseLockPassword.java
Simple merge
diff --cc
src/com/android/settings/ChooseLockPattern.java
Simple merge