tree 7a6ebce5420fb443e0a7dec11a9e2ca4fed57692
parent bbc485c8920343fca48725cd9dac6f7ad0404daf
parent eb91742861607539fa88ae6d962597dde00ff860
author Elliott Hughes <enh@google.com> 1402621934 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402621934 +0000

am eb917428: am ff17671b: Merge "Add a hack to <stdlib.h> until we can fix libvpx."

* commit 'eb91742861607539fa88ae6d962597dde00ff860':
  Add a hack to <stdlib.h> until we can fix libvpx.