resolved conflicts for merge of 177b05d6 to master

    /**

     * Flag for {@link #bindService}: automatically create the service as long

     * as the binding exists.  Note that while this will create the service,

     * its {@link android.app.Service#onStart} method will still only be called due to an

     * its {@link android.app.Service#onStartCommand}

     * method will still only be called due to an

     * explicit call to {@link #startService}.  Even without that, though,

     * this still provides you with access to the service object while the

     * service is created.

     * process for it if needed); if it is running then it remains running.

     *

     * <p>Every call to this method will result in a corresponding call to

     * the target service's {@link android.app.Service#onStart} method,

     * the target service's {@link android.app.Service#onStartCommand} method,

     * with the <var>intent</var> given here.  This provides a convenient way

     * to submit jobs to a service without having to bind and call on to its

     * interface.

     *      description (action, category, etc) to match an

     *      {@link IntentFilter} published by a service.

     * @param conn Receives information as the service is started and stopped.

     * @param flags Operation options for the binding.  May be 0 or

     *          {@link #BIND_AUTO_CREATE}.

     * @param flags Operation options for the binding.  May be 0,

     *          {@link #BIND_AUTO_CREATE}, {@link #BIND_DEBUG_UNBIND}, or

     *          {@link #BIND_NOT_FOREGROUND}.

     * @return If you have successfully bound to the service, true is returned;

     *         false is returned if the connection is not made so you will not

     *         receive the service object.

     * @see #unbindService

     * @see #startService

     * @see #BIND_AUTO_CREATE

     * @see #BIND_DEBUG_UNBIND

     * @see #BIND_NOT_FOREGROUND

     */

    public abstract boolean bindService(Intent service, ServiceConnection conn,

            int flags);