tree caf97e386b3184156f42bfa55c02c1f8dc40b575
parent 153da38c35823319021592090377961018a37c8d
parent 3e81fb6ecfc5aa401baf5b07ba74acb772c89b0b
author David Ng <dave@codeaurora.org> 1449712014 -0800
committer David Ng <dave@codeaurora.org> 1449712014 -0800
mergetag object 3e81fb6ecfc5aa401baf5b07ba74acb772c89b0b
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526281 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAkACgkQ6K0/gZqxDng7rACfQYCpPtKj8qZS0oIfCrtI0tPg
 TowAn073I8YxqhsY8mGxf9fCss44V9XP
 =NS0o
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.

Change-Id: I27e05c3978bb5b82331c81fd1e60a10616a1bd02