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

..

googleplay

Resolve merge conflicts of a5060ee to nyc-dev

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

stories

Resolve merge conflicts of a5060ee to nyc-dev

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

users

Resolve merge conflicts of a5060ee to nyc-dev

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

android-pay-checkout.png

Doc change: Updates to preview program overview and tags.

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

app_invites_1.png

Doc change: Updates to preview program overview and tags.

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

app_invites_2.png

Doc change: Updates to preview program overview and tags.

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

app-indexing-deep-links.png

Doc change: More changes to distribute files, Google Services page update.

2015-05-14 20:05:13 -07:00

cardboard.jpg

Doc change: More changes to distribute files, Google Services page update.

2015-05-14 20:05:13 -07:00

cast.jpg

Doc change: More changes to distribute files, Google Services page update.

2015-05-14 20:05:13 -07:00

concrete-pbc-gpgames.jpg

…

console-apps.png

…

console-reports.png

…

console-settings.png

…

dff-badging.png

Doc change: Updates to preview and distribute.

2015-05-23 21:17:39 -07:00

dff-browse.png

Doc change: Updates to preview program overview and tags.

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

dff-character-group.png

Doc change: Updates to preview program overview and tags.

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

dff-character.png

Doc change: Updates to preview and distribute.

2015-05-23 21:17:39 -07:00

engage-intents.png

Doc change: Updates to preview and distribute.

2015-05-23 21:17:39 -07:00

feature-market.png

…

feature-monetize.png

…

feature-register.png

…

glu-ew-gpgames.jpg

…

google-now-engagement.png

Doc change: More changes to distribute files, Google Services page update.

2015-05-14 20:05:13 -07:00

google-play-bg.jpg

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

gpfw_business.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

gpfw_developer.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

gpfw.jpg

Doc change: Updates to preview and distribute.

2015-05-23 21:17:39 -07:00

hero-acquisition-devbyte.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-carousel-djit.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-carousel-giftedmom.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-carousel-sgn.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-carousel-wego.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-domain-story.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-dots-story.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-family-discovery.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-g-play-guidebooks_2x.png

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

hero-ginlemon.jpg

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

hero-haystack.jpg

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

hero-IO15-google-play.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-IO15-growing-games.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-jelly-button.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-outfit7.jpg

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

hero-playtime-opener.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-rogervoice-story.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-secrets-to-app-success.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

hero-shifty-jelly.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-store-listing-experience.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-the-hunt.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-trello.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hero-wooga.jpg

Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.

2015-06-22 12:35:12 -07:00

hichat-n5-port.jpg

eoc change: Add developer stories for localization.

2013-11-11 01:48:35 +00:00

house-ads.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

indian-rummy-n4-land.jpg

eoc change: Add developer stories for localization.

2013-11-11 01:48:35 +00:00

instapaper.png

…

marquee-play.png

…

mint.png

…

more-app-engagement.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

music-action.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

ota-installs.gif

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

promote_ads_apps.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_gmail.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_inapp.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_play.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_search.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_web.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads_youtube.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote_ads.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote-ads-apps.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

promote-ads-web.png

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

rememberthemilk.png

Doc change: add tablet success story and fix a few issues.

2013-10-10 16:34:40 -07:00

secrets_v2_banner.jpg

Resolve merge conflicts of a5060ee to nyc-dev

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

signin-apps.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

signin-seamless.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

signin-secure.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

tinyvillage.png

…

vector-unit-rt-gpgames.jpg

…

voice-actions-engagement.png

Doc change: More changes to distribute files, Google Services page update.

2015-05-14 20:05:13 -07:00

youtube-card-example.png

Doc change: adjust distribute and preview card grids and styles.

2015-05-17 20:36:16 -07:00

zombie-ragdoll-n5-land.jpg

eoc change: Add developer stories for localization.

2013-11-11 01:48:35 +00:00