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

Browse Source

* commit '3666f42b4574226d17566660ca0945ec30ee528a':

main

The Android Open Source Project 2012-08-02 15:09:17 -07:00 committed by Android Git Automerger

parent 50d7388e6d 3666f42b45

commit 8cb71c2367

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