Fixed the onActivityResult bug that was caused by the manifest

auto mereger. (I removed the auto merge option from project.properties)

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
2012-08-06 12:35:20 -04:00
parent a664e0ad57
commit fc8952e5e9
4 changed files with 126 additions and 5 deletions

View File

@@ -12,4 +12,4 @@ android.library.reference.2=../../location_library/LocationLib
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
# Project target.
target=Google Inc.:Google APIs:16
manifestmerger.enabled=true