OSDN Git Service

Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
authorDaniel Sandler <dsandler@android.com>
Wed, 7 Jun 2017 15:09:57 +0000 (15:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Jun 2017 15:09:57 +0000 (15:09 +0000)
am: 107bfc46c6

Change-Id: I407983d32ce8d2a6758f0125963d128db496d225


Trivial merge