Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,449 Commits 3 Branches 0 Tags
2fe1990ba779ef3fdb77cc596ff9eefeaeef613d
Commit Graph

5 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
Scott Main
7bfd39a47d delete orphaned and obsolete files 
Change-Id: I2e199ce5ff5c4e4c9622897eed0072c3aba02bc4
 2013-05-20 18:14:42 -07:00
Elliott Hughes
84303f5cd6 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623

(cherry picked from commit 965da34de9)

Change-Id: I5a940383fb27900ba560822c060cc5ed864eb771
 2012-12-19 11:09:16 -08:00
Scott Main
22cc2764cc implement new organization for Training classes 
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
 2012-11-14 17:30:24 -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