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

iEYEABECAAYFAlbglzoACgkQ6K0/gZqxDnj9CgCfWiFbLL58gbrJCgA+0kJJ8cbt
LC8AnROWTJYQ1SSeHP+EPNL08EGZPw18
=tw9z
-----END PGP SIGNATURE-----
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9  -s ours am: 2da2f1b383 am: eab078d0b1
am: 240c2126e4

* commit '240c2126e491eb3f3d3ffce35bc1fd33e9e350b4':
  Camera: Disallow dumping clients directly