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

Browse source

* commit '431cd41604208d7c30788d6e3c6655a34fd3e157':

...

This commit is contained in:

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

parent 48697f6dc2 431cd41604

commit 3a18bcccb2

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