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
Rich Slogar
6de010f600
docs: remove exploring sdk link
...
b.android 153523
Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
2015-02-23 11:37:36 -08:00
Quddus Chong
94b3f8eee6
docs: Added new docs for uiautomator testing framework.
...
Change-Id: I9fea9e7a711a37bb1f2492b4aa3938e147614125
2012-11-12 14:23:13 -08:00
Scott Main
50e990c64f
Massive clobber of all HTML files in developer docs for new site design
...
Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3
2012-06-21 21:27:30 -07:00