OSDN Git Service

Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
authorTony Mak <tonymak@google.com>
Fri, 15 Jul 2016 16:20:45 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 16:20:45 +0000 (16:20 +0000)
commit65aeef9d87f6c1898f7f0243b1c6b988960460af
treeb7daa350b884d5b9aeadbe43222328e5dd701d58
parent4481b51667c94d778dc78126c79cd4856720654c
parent28763c5a777e2874a84774d836e7bddd01cd5d2b
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am: 28763c5a77

Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820