am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp

Browse Source

Merge commit '3719f8568e809ffd30f90adc38993256a9d3d066'

* commit '3719f8568e809ffd30f90adc38993256a9d3d066':
  DO NOT MERGE WifiLock extensions for high performance mode

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-18 13:35:33 -07:00

committed by Android Git Automerger

parent bd1355db51 3719f8568e

commit 71f72c37e9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available