tree c096eadb143e61d0936ee3c83e32acf49918df48
parent cadc858329a5929911eff5f9a208229112e36a93
parent 7b2c6385effbb6d6e98bfe29cc6c144211128d9e
author Elliott Hughes <enh@google.com> 1361563815 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361563815 -0800

am 7b2c6385: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."

* commit '7b2c6385effbb6d6e98bfe29cc6c144211128d9e':
  Fix <memory.h> to be a synonym for <string.h> like in glibc.