OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f73b5cb
d872742
)
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am:...
author
Adam Seaton
<aseaton@google.com>
Fri, 19 May 2017 19:05:32 +0000
(19:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 19 May 2017 19:05:32 +0000
(19:05 +0000)
am:
d872742f52
-s ours
Change-Id: Ib653835d7a30261bd8080550c1078a504a3c6d18
Trivial merge