OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a230c76 e6987ad)
am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair
authorSwarna Kumar <skumar@google.com>
Tue, 24 Nov 2009 21:37:20 +0000 (13:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Nov 2009 21:37:20 +0000 (13:37 -0800)
Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp

* commit '20342ca83012b442913b409a9218635de9bd6aa6':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.


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