Trevor Johns 682c24e228 Resolve merge conflicts of a5060ee to nyc-dev ...

This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086

2016-04-19 02:03:59 -07:00

..

bundles_2x.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

bundles.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

datasaver.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

doze-diagram-1.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

doze-diagram-2.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

inline-reply_2x.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

inline-reply.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

inline-type-reply_2x.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

inline-type-reply.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

m-preview-timeline-crop.png

Doc change: Updates to preview program overview and tags.

2015-05-26 14:41:15 -07:00

m-preview-timeline.png

Doc change: updates for preview.

2015-05-22 16:58:14 -07:00

mw-portrait.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

mw-splitscreen_2x.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

mw-splitscreen.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

n-preview-setup.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

notifications-1.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

notifications-2.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

notifications-3.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

notifications-card.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

pip-active.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

pip-button.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

quicksettings.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

sample-activenotifications.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

sample-directboot.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

sample-messagingservice.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

sample-multiwindow.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

sample-scopeddirectoryaccess.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

scoped-folder-access-framed_2x.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

scoped-folder-access-framed.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

screen-zoom-1.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

screen-zoom-2.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

studio-jdk-location.jpg

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00