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:
9c0412b
c1973ec
)
Merge "Log the error when uncrypt timeouts"
author
Tianjie Xu
<xunchang@google.com>
Wed, 28 Sep 2016 19:53:37 +0000
(19:53 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 28 Sep 2016 19:53:37 +0000
(19:53 +0000)
am:
c1973ecbd2
Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e
Trivial merge