tree 0c23896ea20ed06277203de50e9e0512d2cfd96c
parent bcedca25d37bb3a70209e1d02e45720d1f86ddbd
parent dd8439141aeac6dc3a64e25f313d08833e1d85f5
author Elliott Hughes <enh@google.com> 1361564174 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361564174 -0800

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

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