imports cleanup
Merge branch 'master' into android-1.5
imports cleanup
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
refactoring (synchronization with beta branch)
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
methods order
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5
synchronization with beta branch
Merge branch 'master' into android-1.5