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

Browse Source

* commit '72b2575effe57fd99d4dd0eb665daa0f89eef912':

...

This commit is contained in:

Jean-Baptiste Queru

2012-10-03 15:25:44 -07:00

committed by Android Git Automerger

parent 2c590655f9 72b2575eff

commit ebf1862d0e

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