Android 6.0.1 release 21
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEUEABECAAYFAlbglwMACgkQ6K0/gZqxDnipRACgj+Xuu4/oqLJ/G8V7Df4Is6oj
oIwAmK1QziF+iodNSWTejh86KMtYEYQ=
=gzMP
-----END PGP SIGNATURE-----
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
  1. kernel