diff options
| author | Eric Fischer <enf@google.com> | 2010-09-30 11:22:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-30 11:22:45 -0700 |
| commit | bbcde2775d229bb62b0177b5eda056e08aed80bc (patch) | |
| tree | 70ff42f75bcc45dfd853b37dfc8eec751f31fe4c /Android.mk | |
| parent | 624081f3732dc9bc59f31bd6dc6e15f40350aae3 (diff) | |
| parent | 216a5eb4de77d270f19310b5fb71df473809d4c7 (diff) | |
| download | android_packages_apps_Email-bbcde2775d229bb62b0177b5eda056e08aed80bc.tar.gz android_packages_apps_Email-bbcde2775d229bb62b0177b5eda056e08aed80bc.tar.bz2 android_packages_apps_Email-bbcde2775d229bb62b0177b5eda056e08aed80bc.zip | |
Merge "resolved conflicts for merge of 2f580362 to master"
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions