Restore scripts/wait_for_emulator.sh

This script is used as part of our test suite for Travis CI, and is
needed to prevent the build from failing. (Or to be more accurate, to
allow the tests to run at all.)
Remove emulator from L preview bit.
Fixed a string comparison.
Replace .commit() with .apply() in PrefUtils.java

Fix according to issue #20
Change plugin to 'com.android.application' and bump build tools version
Merge pull request #24 from seewes/patch-1

Replace .commit() with .apply() in PrefUtils.java
Merge pull request #18 from tjohns/master

Restore scripts/wait_for_emulator.sh
Merge pull request #21 from Lukas-Stuehrk/FixStringComparison

Fixed a string comparison.
fix french localization of "speaker"

In french, a "haut-parleur" is an amplifier, not a person.
I propose to change this current translation to "orateur".
Fix it-IT localization
Merge pull request #17 from yelinaung/master

Change plugin to 'com.android.application' and bump build tools version
correct translation of string decline in zh-rCN
Merge pull request #34 from WonShaw/master

correct translation of string decline in zh-rCN
Update Travis CI configuration

- Include SDK v20 for Wear support.
- Switch to build tools v20.
Add debug keystore

A keystore needs to be present in order to enable continuous integration
builds. This is standard Android debug keystore with a 100 year
validity.
Update proguard config to exclude test classes

Reference to classes in test frameworks (e.g. JUnit) were causing
Proguard to fail while running the 'build' task.
Merge pull request #35 from tjohns/master

Update Travis CI configuration
Merge pull request #33 from rock3r/master

Fix it-IT localization
Merge pull request #32 from ph0b/patch-1

fix french localization of "speaker"
Merge remote-tracking branch 'original/master' into iosched2014_conferenceengineer_master