tree 877dfb56aa7792fbdd0622d83f9263e2e3f5b6df
parent f9cfef7c4c5a2e6197eda8a770bd131f55611751
parent db47ea76ab83f2ef5aca42de240035885dc7ad1a
author Christopher Ferris <cferris@google.com> 1440652240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652240 +0000

am db47ea76: (-s ours) am 6bab84bb: Merge "Update to v3.18.18 kernel headers."

* commit 'db47ea76ab83f2ef5aca42de240035885dc7ad1a':