am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Browse Source

* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package

...

This commit is contained in:

Xavier Ducrohet 2011-07-20 17:18:04 -07:00 committed by Android Git Automerger

parent 41ce328f7e 7ffa22b984

commit e5e476f18b

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