| commit | afe90c1e5376d2006951449c5061a2b772105955 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Apr 09 13:16:50 2019 +0100 |
| committer | Anton Hansson <hansson@google.com> | Tue Apr 09 13:26:23 2019 +0100 |
| tree | 5533ce123c586af316d83f22132ca914f3a25875 | |
| parent | b44e4632ac0dc899dca9943abd322d84308adc75 [diff] |
Remove duplicate product_specific attribute Here's how this happened 1) Looks like the unbundled branch was merged into this branch, before AOSP was, which brought in Ice735ae9e7f94559d7e0e4bed4fd72c4c3fc1b84 2) AOSP was merged in, including I8feaf8b0db5e886c714c5cdfca8987a7e4978670 3) The conflict above was resolved with I00a70ef8afc96009c1f95a4f80734ab1d18c21fe, which added product_specific in a different location to Ib7f65697af8f3fed6a362a2f4458bf1c2aa0198f 4) When Ib7f65697af8f3fed6a362a2f4458bf1c2aa0198f was merged in without conflict, it added a second product_specific attr. Test: m nothing Change-Id: I4cff03a3609a2503e1303ac6c021afae66f193c9