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

Browse Source

* commit 'c2300d841afeb33f64cc9a3896bbbdf4bd39e62a':

main

The Android Open Source Project 2012-07-31 15:06:09 -07:00 committed by Android Git Automerger

parent 9abcf50691 c2300d841a

commit dcc80c1395

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