eliza chat

eliza chat
Merge branch 'master' of https://github.com/android-wear/workspace

Conflicts:
	ElizaChat/src/main/bin/MainActivity.apk