Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,228 Commits 3 Branches 0 Tags
0fcc5affdee52f0f85cbcab36af56a6385563243
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
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