am 6dd8880c: (-s ours) Reconcile with jb-dev - do not merge

Browse Source

* commit '6dd8880cc9efb5c1152717cc2dead62c7d3adcb8':

...

This commit is contained in:

Jean-Baptiste Queru

2012-10-03 15:23:35 -07:00

committed by Android Git Automerger

parent 0f929c0989 6dd8880cc9

commit 72b2575eff

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

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

Diff Content Not Available