am 0ca4d191: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '0ca4d19117fc79026acc42115f21f4c02df9d902':

main

The Android Open Source Project 2012-08-25 07:21:33 -07:00 committed by Android Git Automerger

parent 57fc681d51 0ca4d19117

commit 74e193719a

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