synchronization with library-service branch
Merge branch 'master' into android-1.5
updated package name
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
encoding "detection" for xml files
Merge branch 'master' into android-1.5
imports cleanup
Merge branch 'master' into android-1.5