OSDN Git Service

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

Change-Id: I3493f13c16b24d343f61e80d70f37cf62d6b8ee2