am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master

Browse Source

* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
  Fix XMLNS detection in SDK Repo XSD files.

...

This commit is contained in:

Raphael

2011-03-30 08:20:33 -07:00

committed by Android Git Automerger

parent 74a30541a4 06f2189a4e

commit ee13f1c3a7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available