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:
e329adf
73b2f59
)
Only disable trust agents after lockout am: 9d6fc9246b
author
Adrian Roos
<roosa@google.com>
Thu, 11 Aug 2016 02:44:42 +0000
(
02:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 11 Aug 2016 02:44:42 +0000
(
02:44
+0000)
am:
73b2f5981e
Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389
Trivial merge