OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7198c0a 971ff47)
am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)
* commit '971ff47c75889a2fc4ac710fbe62ba819feeaba6':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."


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