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

Browse Source

* commit '2afdd4c4273ba3c772da45478a79ee6b2fe1c9e0':

main

The Android Open Source Project 2012-08-01 14:50:41 -07:00 committed by Android Git Automerger

parent 5e5d0b83a6 2afdd4c427

commit 66b603be96

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