OSDN Git Service

Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7 -s ours
authorFan Zhang <zhfan@google.com>
Mon, 19 Jun 2017 14:53:02 +0000 (14:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 14:53:02 +0000 (14:53 +0000)
commit5b3bc0e1d8674c68438cdc3b73800d2f00e27a69
tree8be7a556c0b1da2880022d32b4701d41787c36cf
parentf1d7a456ea5ca3478f1dcefb06c25ed0ef3b381c
parentc15dd4ee9b9c063f9999129d4437ce9376f7f57f
Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7  -s ours
am: c15dd4ee9b  -s ours

Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e