| commit | 6b65c84656f1e49ddd5cc30ed8071c53d06824f6 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Wed Mar 28 11:53:36 2012 -0700 |
| committer | Raphael Moll <raphael@google.com> | Wed Mar 28 11:53:42 2012 -0700 |
| tree | 6625e05964b9bf64c27289bb64b4d5b0a5ef52ea | |
| parent | d6a3832650c70e3cfd6efe88077d62b96a357e70 [diff] | |
| parent | 7f45b2e9402ce2b18594f750c073c01a3adbc1e5 [diff] |
resolved conflicts for merge of 7f45b2e9 to master 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