OSDN Git Service

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


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