OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16330e2 85a7f99)
am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeyc...
authorJeff Brown <jeffbrown@google.com>
Wed, 25 May 2011 21:35:21 +0000 (14:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 May 2011 21:35:21 +0000 (14:35 -0700)
* commit '85a7f99cfe066f054d4ddf4feb737f0395c9943b':
  Refactor how timeouts are calculated. (DO NOT MERGE)


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