tree 21dfd249b7c960e539ba7d5775896f29d3efba86
parent 6953ae21769e8233a854d6fa61fce2792401de35
parent f79417e198124e78457517ec69bf7a9f48c953ce
author David Ng <dave@codeaurora.org> 1449713072 -0800
committer David Ng <dave@codeaurora.org> 1449713072 -0800
mergetag object f79417e198124e78457517ec69bf7a9f48c953ce
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526282 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAoACgkQ6K0/gZqxDng44wCeLR+SA2XSFNLDs49k2lJ4E1FL
 n3wAn1lflyDDWq6BrZbUFrW2fOP/DF28
 =/PmL
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Retain fragment loaders
  Set host when restoring a fragment
  Fix minor doc bug on DocumentFile.
  [RenderScript] pass correct length of ains to BLAS functions.

Change-Id: I42f6bc8d255d65c04c09b32f2e75d13702c7c6a5