OSDN Git Service

Merge "Move work notification settings back to bottom" into oc-mr1-dev am: 466adba25e
authorWinston Man <hkman@google.com>
Wed, 9 Aug 2017 09:25:40 +0000 (09:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 09:25:40 +0000 (09:25 +0000)
am: a266a2a0c0  -s ours

Change-Id: I03053ee698c00815ae88b8cd8a3c60a28df8849f


Trivial merge