tree 94ebf4bc0b237fe778ee008c6b6b22f3d01e207c
parent 76502788598a85d24b9ae3e253016a9370c49a42
parent 9fc9da2b2d8837165f0fc3819d702959c367299f
author Divya Sharma <c_shard@codeaurora.org> 1446658264 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658264 -0800
mergetag object 9fc9da2b2d8837165f0fc3819d702959c367299f
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052354 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjuVwCeKlw/S/lVXYelfINSlSAkYjCb
 lNoAn02Xkyjchqer3+jYyzmLlEtMnvN0
 =fO8n
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Don't crash on startup if we can't fetch the interface list.

Change-Id: Ia1c158ea77f71035b665282cdeaed619cbb461e3