tree b74aa191ac219c45a56f93a9e56a4d76bd396e4f
parent be9df736624983706ded46b963ecd82dcbe27125
parent a7f9a47589c5722628e6b3ee321fbfa298cf580d
author The Android Automerger <android-build@android.com> 1430085738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430085738 +0000

am a7f9a475: (-s ours) am 8aa31070: am d0979918: (-s ours) Manually merging CL https://googleplex-android-review.googlesource.com/#/c/379893 with this sequence sdu device/lge/hammerhead-kernel git checkout 21b7a669ed50b1ff0423167f7fad8c9aedbc8c02 vmlinux.bz2 git checkout 21b7a6

* commit 'a7f9a47589c5722628e6b3ee321fbfa298cf580d':