tree ec6ebaadbc4b6b56d9d17b849cf93691e710468d
parent adaf3078f6c555fff06fa39c6bf3269e34acc950
parent 90a1e093775bf0b5f1abb33aeda94c2e91b634ac
author Deepanshu Gupta <deepanshu@google.com> 1428344413 +0000
committer android-build-merger <android-build-merger@google.com> 1428344413 +0000

Merge "Fix project structure." into studio-1.3-dev automerge: 80cd169
automerge: 90a1e09

* commit '90a1e093775bf0b5f1abb33aeda94c2e91b634ac':
  Fix project structure.