diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-22 16:04:00 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-22 16:04:00 -0700 |
| commit | fc398af5f80ba522da2f95453566be800edd4021 (patch) | |
| tree | f0e96b1bf1e3aaee8f68ea894e4b3ea51eb626f8 /device_base.mk | |
| parent | 129629da577719c95e27b84616c2c3cafc10dc86 (diff) | |
| parent | 40717996bb4b66460a7b619b6da77b1d830f3379 (diff) | |
| download | device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.zip device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.tar.gz device_samsung_crespo-fc398af5f80ba522da2f95453566be800edd4021.tar.bz2 | |
resolved conflicts for merge of 40717996 to master
Change-Id: I36d3e5330eff7580dc2bf28c076062de4b418561
Diffstat (limited to 'device_base.mk')
0 files changed, 0 insertions, 0 deletions