tree eb9bacb58a27b279156a042618d36df045794a1d
parent 665f33bc9f2fa56fc3507e252e9073230f519fd5
parent 18ab90f13c059813229a36194d798e5e1b74e679
author Elliott Hughes <enh@google.com> 1422731404 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422731404 +0000

am 18ab90f1: am ece40ff8: Merge "Fix "error: \'memcpy\' was not declared in this scope"."

* commit '18ab90f13c059813229a36194d798e5e1b74e679':
  Fix "error: 'memcpy' was not declared in this scope".