tree 685d9838ccf730135c9dca8eeecd38e631486277
parent db47ea76ab83f2ef5aca42de240035885dc7ad1a
parent 68ffdee696b57b63fce2753508662a920ad71b11
author Christopher Ferris <cferris@google.com> 1441303206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441303206 +0000

am 68ffdee6: Merge "Update to v3.18.21 kernel headers."

* commit '68ffdee696b57b63fce2753508662a920ad71b11':
  Update to v3.18.21 kernel headers.