OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63165f2 592e874)
am 592e8744: (-s ours) am d00737fc: am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 03:04:22 +0000 (03:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 03:04:22 +0000 (03:04 +0000)
* commit '592e874428920b5cc505952b988ae6fa6e977592':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help