tree d3027aeb161e13673416d1684e6f4e47c85241d0
parent ea4efc6d200a493084a90e80d9eb0dc5ffa96cdb
parent 435a2031d62e868aae928ec3c4090ea3bbea3397
author Ethan Yonker <dees_troy@teamw.in> 1513284239 -0600
committer Ethan Yonker <dees_troy@teamw.in> 1513363729 -0600
mergetag object 435a2031d62e868aae928ec3c4090ea3bbea3397
 type commit
 tag android-8.1.0_r1
 tagger The Android Open Source Project <initial-contribution@android.com> 1512498668 -0800
 
 Android 8.1.0 Release 1 (OPM1.171019.011)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWibl7AAKCRDorT+BmrEO
 eCDQAJ4x71kcnWYqkDD96CKPJKK+C+THYgCeLdtnCU5zW8A9jciesJwFT91XWfI=
 =efrY
 -----END PGP SIGNATURE-----

Merge up to android-8.1.0_r1 and fix conflicts

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc