am c5f1504e: am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."
authorElliott Hughes <enh@google.com>
Mon, 30 Jun 2014 23:16:01 +0000 (23:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Jun 2014 23:16:01 +0000 (23:16 +0000)
* commit 'c5f1504e3db3a39bb951bf01e2d0d758ca93cc44':
  Restore <nsswitch.h> which is BSD API, not private.


Trivial merge