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:
6b32f38
c68e6d6
)
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2
author
Tianjie Xu
<xunchang@google.com>
Wed, 28 Sep 2016 19:59:12 +0000
(19:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 28 Sep 2016 19:59:12 +0000
(19:59 +0000)
am:
c68e6d6708
Change-Id: I23ee644fb2f73fc3cece4faf59eb63417cfe3ea6
Trivial merge