Merge pull request #1 from google/master

Merge google/iosched master
Remove mention of lpreview from BUILDING.md

Removed lpreview build section
Updated gradle commands (removed lpreview and classic productFlavors)
Updated SDK Manager packages needed (removed kiktkat, included lollipop)

SDK Build-tools version 21 has solved and unsolved issues, Current rev is 21.0.1
https://code.google.com/p/android/issues/detail?id=77629
http://stackoverflow.com/questions/26446610/android-gradle-project-upgrading-build-tools-to-21-0-1-aapt-throws-exception
Merge pull request #60 from ardock/update-building

Remove mention of lpreview from BUILDING.md (and update build instructions)
Fix ScrimInsets* classes to use ViewCompat.postInvalidateOnAnimation

Change-Id: I7ef8e65110fa861605f4d4f9aebb10ac775c29b8
Merge pull request #62 from romannurik/master

Fix ScrimInsets* classes to use ViewCompat.postInvalidateOnAnimation
Fix for 20.0.0 build tools bug

reference: https://code.google.com/p/android/issues/detail?id=77629
Merge pull request #65 from VipSaran/master

Fix for 20.0.0 build tools bug
Update travis.yml for lollipop

Updated build-tools to rev 21.0.1
Updated android component, image and target to 21
Merge pull request #68 from ardock/update-travis-to-android-21

Update travis.yml for lollipop
Update build tools rev 21.0.2

Updated build tools to rev 21.0.2 in android build.gradle, building doc and travis.yml
This rev. solves the windows users issue:
https://code.google.com/p/android/issues/detail?id=77629

Travis wont work until they upgrade or you install 23.0.5 sdk manually,
emulator or something i dont know do. I ll wait your/their solution.
http://docs.travis-ci.com/user/languages/android/
https://github.com/travis-ci/travis-cookbooks/blob/master/ci_environment/android-sdk/CHANGELOG.md
Merge pull request #70 from ardock/update-build-tools-rev-21.0.2

Update build tools rev 21.0.2
Update to v21 SwipeRefreshLayout. Also fix nav drawer BACK button bug.

Change-Id: I13a0880240c4d49b2fdca5948594567332ca8aaf
Merge pull request #71 from romannurik/master

Update to v21 SwipeRefreshLayout. Also fix nav drawer BACK button bug.
Merge remote-tracking branch 'original/master'

Conflicts:
	android/build.gradle