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
Elliott Hughes	771f2d5428	Fix debugging-log documentation errors. ART has never supported log.redirect-stdio. Don't imply that System.out and System.err go to /dev/null. Bug: http://b/18092307 Bug: https://code.google.com/p/android/issues/detail?id=165602 Bug: https://code.google.com/p/android/issues/detail?id=62555 Change-Id: If5304a129e8941865211deb86766531925255796	2015-06-05 15:44:51 -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

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

Elliott Hughes

771f2d5428

Fix debugging-log documentation errors.

ART has never supported log.redirect-stdio.

Don't imply that System.out and System.err go to /dev/null.

Bug: http://b/18092307
Bug: https://code.google.com/p/android/issues/detail?id=165602
Bug: https://code.google.com/p/android/issues/detail?id=62555
Change-Id: If5304a129e8941865211deb86766531925255796

2015-06-05 15:44:51 -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

3 Commits