tree 3b4150137aa283430a18f187593f277186df6596
parent 955f8769d470fb2bbb8a1d44a39ce8e104085d9a
parent 9ac18e70df13c2723ad9a8e7460ba0129fda7a03
author Divya Sharma <c_shard@codeaurora.org> 1446658447 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658447 -0800
mergetag object 9ac18e70df13c2723ad9a8e7460ba0129fda7a03
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052355 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgMACgkQ6K0/gZqxDnhsxQCeKt2/k/FK9KFcR2/zAcOFLYZ9
 nzgAniC9WtA31lCeYiTUHv8eJpEJj7xx
 =Q3UI
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Avoid frequently operation on btwrite
  Revert upio changes to fix wear timeouts.
  Fix btwrite timer timeout for Angler (1/2)

Change-Id: I6a2ba3d1fa87b5bfc056e1777279c64faefb0b47