From: Andrew Solovay <asolovay@google.com>
Date: Tue, 1 Aug 2017 21:46:46 +0000 (+0000)
Subject: Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into... 
X-Git-Tag: android-x86-9.0-r1~410^2~3^2~89
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97d49c65adbb538798ca218698d5b325383a689d;p=android-x86%2Fframeworks-base.git

Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc" into oc-dr1-dev-plus-aosp
am: ce4d45e399

Change-Id: I64fd78a2730cdb2565c56bdf75938029f4c3df75
---

97d49c65adbb538798ca218698d5b325383a689d