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)
commitdd9efcbab631a823d67c71a36e17c15ebd8fe502
tree7b445feb2ce341520e9257516323e1c766a6d609
parent27cc284e02814cf45a25798c018eea77fd18b85c
parentc5f1504e3db3a39bb951bf01e2d0d758ca93cc44
am c5f1504e: am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."

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