diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:24:41 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:24:41 -0700 |
| commit | 87f8d661b3330fc8da5362a70a86d3807be2c728 (patch) | |
| tree | 43625c0cf9ebc91f1482a7a9a17448b5167178ef /self-extractors/Android.mk | |
| parent | de70238da83b34e65d5eef89d8026b9138edc987 (diff) | |
| parent | 0c5d1eba3db80c54a1866d4501292fdeb48ee84f (diff) | |
| download | device_samsung_maguro-87f8d661b3330fc8da5362a70a86d3807be2c728.zip device_samsung_maguro-87f8d661b3330fc8da5362a70a86d3807be2c728.tar.gz device_samsung_maguro-87f8d661b3330fc8da5362a70a86d3807be2c728.tar.bz2 | |
resolved conflicts for merge of 0c5d1eba to ics-scoop-plus-aosp
Change-Id: I492b4c3a0b7d50e8213b0a39ccfdab34fbbfeed1
Diffstat (limited to 'self-extractors/Android.mk')
0 files changed, 0 insertions, 0 deletions