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:
1eb20e1
e422b0b
)
Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev
author
Tianjie Xu
<xunchang@google.com>
Thu, 29 Sep 2016 18:10:01 +0000
(18:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 29 Sep 2016 18:10:01 +0000
(18:10 +0000)
am:
e422b0b29f
Change-Id: I8f12be5048b6022a8f2422a9a5e8121ede9daa1c
Trivial merge