tree ef6978910d9e685dc5c42df77a8ae4723cd23eab
parent 71472736d2741fdf2ba4cd32f10b57925ca9bb99
parent 99b17ad266d0005b5bbbea57284b92b73b6c5737
author Jordan Liu <jminjie@google.com> 1501128434 +0000
committer android-build-merger <android-build-merger@google.com> 1501128434 +0000

Merge "Do not call startService"
am: 99b17ad266  -s ours

Change-Id: Ifd712e887c5d2631de654681ebf3f8acb1dcfee2