Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,783 Commits 3 Branches 0 Tags
0f018570fff044bb68b8009815ae7e5c397d09fd
Commit Graph

2 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
489218c3ed docs: Added overview page and Javadocs for the Android Testing Support Library. 
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
 2015-03-11 16:08:24 -07:00