tree 6114fdb4be02539725540d4c1534ebbcc98a5d54
parent ae03b0076973d5ece5fd300748c29098955afec7
parent f8ed7d3f0ea87b3fc1aa72859386c82d8d9bdbd4
author David Ng <dave@codeaurora.org> 1449709334 -0800
committer David Ng <dave@codeaurora.org> 1449709334 -0800
mergetag object f8ed7d3f0ea87b3fc1aa72859386c82d8d9bdbd4
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526275 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAMACgkQ6K0/gZqxDnh1HACfSJZQ45FipP/yJrZXDB+9K/Pw
 +msAnip/dVM0cAhBryUAf7/YaGZd+4WQ
 =QzU9
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Fixes unnecessary multi-merge steps.

Change-Id: I3dc4a714c4ab6a9db1ab477eadd6d2fbff1d5731