diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 12:29:10 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 12:29:27 -0700 |
| commit | 09fa73b3c334da4c061fc346dc65714f8738e5f1 (patch) | |
| tree | 9858c60919e21291ee9a0d935ff44c86393cb527 /target/product/languages_small.mk | |
| parent | 6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd (diff) | |
| parent | 8928ef8b4cc46bf9c5be3466ad8cb4ab40bb8a2c (diff) | |
| download | build-09fa73b3c334da4c061fc346dc65714f8738e5f1.zip build-09fa73b3c334da4c061fc346dc65714f8738e5f1.tar.gz build-09fa73b3c334da4c061fc346dc65714f8738e5f1.tar.bz2 | |
resolved conflicts for merge of 8928ef8b to master
Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
Diffstat (limited to 'target/product/languages_small.mk')
0 files changed, 0 insertions, 0 deletions