tree d422535bf98852f415f7a88378a4d3e2df04b0a2
parent 8dfa6b76191f49f4873b50d4a69999a46b055f08
parent 9e7ee61753f32ad2fa1d6572fc7d90648cefb0eb
author David Ng <dave@codeaurora.org> 1449714246 -0800
committer David Ng <dave@codeaurora.org> 1449714246 -0800
mergetag object 9e7ee61753f32ad2fa1d6572fc7d90648cefb0eb
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526283 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAsACgkQ6K0/gZqxDnhnCQCdEXFnSXkB/moYkk6knKItgTdG
 sB4AoIS5NXjY7H+r9CTeD2dpk9mmEUYl
 =+Nhs
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add extra checks and timeouts to account migration. DO NOT MERGE

Change-Id: Icfc43ebf3b0da16344030210dffc04f99e6a47e7