diff options
| author | Ying Wang <wangying@google.com> | 2010-09-24 18:27:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-24 18:27:29 -0700 |
| commit | 509d28b2b3cb3eb4d8bbd36a365457cb7b14f658 (patch) | |
| tree | 263ae9bfc9d2fcf2335ea951e554bb9daa7fa934 /core/legacy_prebuilts.mk | |
| parent | afd9652f6de5e98520ff0bf11ee5596412907fdc (diff) | |
| parent | 3453d5f3a22e7a293de9b8c6853f89e6411c8dd9 (diff) | |
| download | build-509d28b2b3cb3eb4d8bbd36a365457cb7b14f658.zip build-509d28b2b3cb3eb4d8bbd36a365457cb7b14f658.tar.gz build-509d28b2b3cb3eb4d8bbd36a365457cb7b14f658.tar.bz2 | |
resolved conflicts for merge of 3453d5f3 to master
Change-Id: If23d2817b4d74d48632776923805c2141da82257
Diffstat (limited to 'core/legacy_prebuilts.mk')
0 files changed, 0 insertions, 0 deletions