OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd21212 203b435)
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."


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