diff options
| author | Benoit Goby <benoit@android.com> | 2012-01-18 15:32:51 -0800 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2012-01-18 15:32:51 -0800 |
| commit | 6c5dc352f7e580c01b217f049d6d56dc7f0098cc (patch) | |
| tree | c1bd0dba4f522fdf804e4984d9d06b77f9d16cec /BoardConfig.mk | |
| parent | 85b8c2381ba1907c87785a040c7dcc06e42b88de (diff) | |
| parent | 7e5c4af7a68997bfd96d9a70fa0471a01a11c914 (diff) | |
| download | device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.zip device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.tar.gz device_samsung_tuna-6c5dc352f7e580c01b217f049d6d56dc7f0098cc.tar.bz2 | |
resolved conflicts for merge of 7e5c4af7 to master
Change-Id: I2aaed3c8b7e32b33beca0632eb4313894666195b
Diffstat (limited to 'BoardConfig.mk')
0 files changed, 0 insertions, 0 deletions