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)

Trivial merge