OSDN Git Service

Merge changes from topic 'dungeon' into oc-dev
authorDaniel Sandler <dsandler@android.com>
Mon, 5 Jun 2017 19:03:26 +0000 (19:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 5 Jun 2017 19:03:32 +0000 (19:03 +0000)
commit36a673a7d701ce5adcdd00aac7d552f9137c5636
tree78268e110c5e72a96ac0235c30b58a07aabcb534
parent1d1cf1305664ef1bbc375a5ec621ed964b626e2c
parent008cea772ac4d6122e81c19ff6128e33b7415917
Merge changes from topic 'dungeon' into oc-dev

* changes:
  Hide redundant foreground service notifications.
  Updates to Dianne's Dungeon.