tree 6a00ac89c9d4f320d48a803f4f49bbfdd7f0bc37
parent d3b5e0f8f6fa815d15b9ab9a4a9a384f5ab305da
parent ebd4809777068088ef599ad6fec72733554572d2
author David Ng <dave@codeaurora.org> 1449714547 -0800
committer David Ng <dave@codeaurora.org> 1449714547 -0800
mergetag object ebd4809777068088ef599ad6fec72733554572d2
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526284 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAwACgkQ6K0/gZqxDngq8gCffldaskUHwm/Vo7p5/LzClkd/
 CLUAn3g4kyyx3o4m7GfVeN98aRMYxIod
 =H/E7
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Add Usage and Diagnostics to main screen
  Fix NPE in storage migration settings

Change-Id: Id970ce5613769debd77c0adcb2f6f9ef4a956d1f