| commit | 71f72c37e97021520de1ca07271287c01b481cff | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 13:35:33 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 13:35:33 2010 -0700 |
| tree | 755071f6ba33e67d5db10ab434da63fc5077cd6a | |
| parent | bd1355db5168240abefffe1773ba87e0a8a7ea3b [diff] | |
| parent | 3719f8568e809ffd30f90adc38993256a9d3d066 [diff] |
am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp Merge commit '3719f8568e809ffd30f90adc38993256a9d3d066' * commit '3719f8568e809ffd30f90adc38993256a9d3d066': DO NOT MERGE WifiLock extensions for high performance mode