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

Browse source

* commit 'c2f34af0d9ab20a3827ef9402d14343100a224a7':

...

This commit is contained in:

Jean-Baptiste Queru 2013-03-11 12:27:37 -07:00 committed by Android Git Automerger

parent c5a129e117 c2f34af0d9

commit 4721099487

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 is not available