Recommit of Android Studio 1.0 Code

Recommit