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:
592e874
ea19688
)
am ea196888: am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e8...
author
Zach Jang
<zachjang@google.com>
Wed, 16 Sep 2015 02:45:37 +0000
(
02:45
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 16 Sep 2015 02:45:37 +0000
(
02:45
+0000)
* commit '
ea196888a0a1a9c0e67aa809676a12a7d0cb955e
':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Trivial merge