| commit | 8d6f7ac4855eb5dbbf55db151a1e1157ed82f966 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Thu Jul 25 16:42:28 2013 -0700 |
| committer | Siva Velusamy <vsiva@google.com> | Thu Jul 25 16:43:39 2013 -0700 |
| tree | 81b47e3db79c8a63af22ef251589d65f50520554 | |
| parent | 84209b9856d586b0c075e0f5022d8901561a69d3 [diff] | |
| parent | ba21c2c7ed72550ccc28efb2445c1161cb45cb38 [diff] |
Merge commit 'ba21c2c7' into master We just use the template file, the older file from jbmr2 can be deleted Conflicts: sdk/plat_tools_source.properties Change-Id: Ifdb6954790d81758227b18139cdc496344a8f8fb