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

3 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
Neil Fuller
71fbb81b14 Fix @code escapes 
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
 2015-12-02 14:24:11 +00:00
Luan Nguyen
1afb2d5335 docs: Pare down the adb guide and remove sections that are duplicated 
in the tools list.

bug: 12879186
Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
 2015-06-22 17:00:02 -07:00