tree 93cc76699a9ff7b8da4d064c57d241dacb3a18ba
parent 053f30bb2cb3fc9f974e37489075c8d8961a8d2e
parent aa4bc822d6b3b3e39d42a387922553cf7e460994
author Elliott Hughes <enh@google.com> 1363127979 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363127979 -0700

am aa4bc822: Merge "Update err.h to get the assembler guards."

* commit 'aa4bc822d6b3b3e39d42a387922553cf7e460994':
  Update err.h to get the assembler guards.