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:
fa6f549
f86894c
)
am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9...
author
Tao Bao
<tbao@google.com>
Mon, 31 Aug 2015 23:14:44 +0000
(23:14 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 31 Aug 2015 23:14:44 +0000
(23:14 +0000)
* commit '
f86894cb9c34f32c2d6f533e1c188dc4046e602c
':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Trivial merge