tree b33220a5c293400ba785a6fa49bc647a550eb93d
parent 0188733e426695f1cf6090d4c51f2652e68eb51a
parent 64f44b8444dabd69cf391d42e10d44e8e926a79d
author Stephen Hines <srhines@google.com> 1412205669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412205669 +0000

am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev

* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
  Remove obsolete reference to ddk; Fixes for -Werror