tree a487307e6723b7bd28aa4f4003e655a491e53530
parent 3684c83687e449f2440d9267e0e54fbbfac87a1d
parent 64f44b8444dabd69cf391d42e10d44e8e926a79d
author Stephen Hines <srhines@google.com> 1412204695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412204695 +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