am d69ec35b: am 1aa6708c: Fix the build. Oops.

Merge commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda'

* commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda':
  Fix the build. Oops.
This commit is contained in:
David 'Digit' Turner 2010-10-12 01:45:28 -07:00 committed by Android Git Automerger
commit 2410512c4f

View File

@ -42,7 +42,9 @@ namespace std {
using ::exit;
using ::abort;
using ::atexit;
#if 0 /* MISSING FROM BIONIC */
using ::on_exit;
#endif
using ::getenv;
using ::putenv;