am 6c337e7a: resolved conflicts for merge of bfb2aa46 to jb-mr2-dev

Browse Source

* commit '6c337e7a663c1049e58e0051bd7bfba61614ef37':
  Tweaks for forward compatibility

...

This commit is contained in:

Jean-Baptiste Queru 2013-03-07 20:14:05 +00:00 committed by Android Git Automerger

parent d56f8effd6 6c337e7a66

commit f092d1188e

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