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

Browse Source

* commit '12bc4c4babd3db352fd58062fcdf6223060a5379':

main

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

parent 18d688c94b 12bc4c4bab

commit 9708aa4e5e

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