Merge branch 'merge_android_2'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 13:16:08 +0000 (16:16 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 13:16:08 +0000 (16:16 +0300)
commitc4cafe94521123ca619988514ee1c3b461682d31
tree665ab71b07693f72411c364c311c2e560a548ada
parent86675875aab8608929bda895532509e8f983b9c6
parent57dd80c08152f06bfac522191d48b1beaeb0a2e6
Merge branch 'merge_android_2'
.idea/modules.xml
build/scripts/layouts.gant
build/scripts/libLicenses.gant