am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '9708aa4e5e1d2909119eed2b47f06e932fc512a2':

main

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

parent 18d688c94b 9708aa4e5e

commit 99a7231d50

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