am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."
authorElliott Hughes <enh@google.com>
Mon, 30 Jun 2014 23:10:03 +0000 (23:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Jun 2014 23:10:03 +0000 (23:10 +0000)
commitc5f1504e3db3a39bb951bf01e2d0d758ca93cc44
tree0839de6aedb91cd43444da2c40ea67f66a3a68e8
parent0bdbc499baf361e1b04ba97baf60e0ccdbddeb04
parent6cdab387b3fa6900ba918318edc426b5cb62b66e
am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."

* commit '6cdab387b3fa6900ba918318edc426b5cb62b66e':
  Restore <nsswitch.h> which is BSD API, not private.