refs/heads/marshmallow-dr1.6-release - device/asus/flo-kernel

commit: ba85a48271c8a5fd6d43653dffe153a40a100125
[log]
author: Ed Tam <[email protected]>
Thu Nov 12 23:20:30 2015 +0000
committer: android-build-merger <[email protected]>
Thu Nov 12 23:20:30 2015 +0000
tree: ab8cbcc917d27a14835423e3eec45ef35fe723b9
parent: 19ba6f1b0bf1f684cb7ae4e283390ce58e3b0ed9 [diff]
parent: 6eb7c74188e27b5d271b22e4f776cba854c8a06e [diff]

resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203  -s ours am: a40e99046b
am: 6eb7c74188

* commit '6eb7c74188e27b5d271b22e4f776cba854c8a06e':
  flo: update prebuilt kernel [DO NOT MERGE]

tree: ab8cbcc917d27a14835423e3eec45ef35fe723b9

kernel