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:
29a26dc
64e8f72
)
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsSt...
author
Rich Cannings
<richc@google.com>
Thu, 4 Apr 2019 07:44:46 +0000
(
00:44
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 4 Apr 2019 07:44:46 +0000
(
00:44
-0700)
am:
64e8f72665
-s ours
am skip reason: subject contains skip directive
Change-Id: I44d66d0b01622ca9085796d464f94097474dd41f
Trivial merge