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

..

basic-lifecycle-create.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

basic-lifecycle-paused.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

basic-lifecycle-savestate.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

basic-lifecycle-stopped.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

basic-lifecycle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

fragments-screen-mock.png

docs: for AU basic training on fragments

2012-04-19 18:58:03 -07:00

intent-chooser.png

Revert "docs: Watermark images with easter eggs"

2014-04-18 18:34:41 +00:00

intents-choice.png

…

network-settings1.png

Revert "docs: Watermark images with easter eggs"

2014-04-18 18:34:41 +00:00

network-settings2.png

Revert "docs: Watermark images with easter eggs"

2014-04-18 18:34:41 +00:00

sdk-manager.png

docs: for AU basic training on fragments

2012-04-19 18:58:03 -07:00