4 Commits

Author	SHA1	Message	Date
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
Quddus Chong	7af3566912	docs: Added Javadocs for Testing Support Library v0.3 and updated ... the corresponding setup instructions. bug: 21442922 Change-Id: I7374e8102fc95377e83db738ab7ff20510e04faa	2015-06-01 17:18:39 -07:00
Quddus Chong	8408cbe3ad	cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support ... Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402 Change-Id: I697f57335b671d5f17685c1f82d7c9158e6d4ce6	2015-04-21 09:33:09 -07:00
Quddus Chong	489218c3ed	docs: Added overview page and Javadocs for the Android Testing Support Library. ... Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed	2015-03-11 16:08:24 -07:00