frameworks_base

Author SHA1 Message Date

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	4bc762a919	docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator. Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d	2015-05-11 14:09:25 -07:00

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

4bc762a919

docs: Added training docs for Android unit testing tools and APIs.

This training covers techniques for running unit tests on local
machines, using mock objects in local unit tests, and building
instrumented unit tests to run on a device or emulator.

Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d

2015-05-11 14:09:25 -07:00

2 Commits