Merge branch 'merge-android-15'
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 18 Dec 2015 10:18:26 +0000 (13:18 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 18 Dec 2015 10:18:26 +0000 (13:18 +0300)
commit6f51b203f6705cd088635dc95d8887795c480d70
treedf2e8e7a5e14ffa0c36f58cd7d0c5da2650527f6
parente206252b6f519b9c900cc496043eccf9a989177e
parentd4b796d1f2f95d1d9691b88b6a93fc5d69ca6f71
Merge branch 'merge-android-15'