resolved conflicts for merge of 7f45b2e9 to master

Browse Source

Explanation of conflict:
- I did modify master a while go to support new
  source_prop_template files.
- That CL was then manually merged into master-aosp
  and then auto-merged back to master.
- The template files were already in master.
- But the master version had 1 extra new line in each
  (to add gpu support).
- Thus conflict. CQFD.

Change-Id: I0a04a0239fabbdc5349e197af4531a5ea6b2ff76

...

This commit is contained in:

Raphael Moll

2012-03-28 11:53:36 -07:00

parent d6a3832650 7f45b2e940

commit 6b65c84656

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