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:
12964a7
446637e
)
Merge "Ignore lock type in ChooseLockGeneric in non-FBE"
author
Maurice Lam
<yukl@google.com>
Tue, 9 Oct 2018 01:02:25 +0000
(
01:02
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 9 Oct 2018 01:02:25 +0000
(
01:02
+0000)
1
2
tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
Simple merge
OSDN Git Service
