am 704aa833: (-s ours) DO NOT MERGE cherry-pick "adb reboot" from master:

Browse Source

Merge commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd'

* commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd':
  DO NOT MERGE cherry-pick "adb reboot" from master:

...

This commit is contained in:

Mike Lockwood 2009-08-11 18:11:42 -07:00 committed by Android Git Automerger

parent 37b210f560 704aa83338

commit 1ca6711905

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

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

Diff Content Not Available