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

Browse Source

* commit '4152d3f4c8332bbac3284283656b49661ad21b04':
  only abort when errors happen on the main display

...

This commit is contained in:

The Android Open Source Project 2012-09-26 10:07:53 -07:00 committed by Android Git Automerger

parent 008cc14e90 4152d3f4c8

commit ded29dea7d

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