# HG changeset patch
# User cin
# Date 1530063304 -10800
# Node ID 1dc2fd263b90691e6ecd750c9a330c915f11f423
# Parent  40d2e49a72194e17d9685a6fce46785acb4a9afe# Parent  2dfba21cd87918349576bba930253a37dcfb30fd
Merge

diff -r 40d2e49a7219 -r 1dc2fd263b90 core/build.gradle