diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-08-11 01:32:24 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-08-11 01:32:24 +0800 |
| commit | 60f640e3864e6d2dd52b3993f838c2461eb13e1f (patch) | |
| tree | 176b32284ae3d72236f06a17c62298b3c4993471 /Android.mk | |
| parent | be1cb8546ee56ba86aae76310664f16222b36695 (diff) | |
| parent | 382b384ec2cd948a82fe42294b18e4ec630bbdf6 (diff) | |
| download | packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.zip packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.gz packages_apps_LegacyCamera-60f640e3864e6d2dd52b3993f838c2461eb13e1f.tar.bz2 | |
resolved conflicts for merge of 382b384e to master
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions