tree b282ee4fb1b165ed118025dd54a18f0ec72ee7c2
parent c7d448429fa264787d231d20bb1d8e2e273e852b
parent e4dce38d3d19cc36b32c33a87f504bdb6dbb76ae
author David Ng <dave@codeaurora.org> 1449710331 -0800
committer David Ng <dave@codeaurora.org> 1449710331 -0800
mergetag object e4dce38d3d19cc36b32c33a87f504bdb6dbb76ae
 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/gZqxDngyJgCfXOvRa8a0E5ll0o8Rrkcd+K1l
 Sh8An2g5Auo4FDGVHN33II3dfvmOtunN
 =oLhh
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Remove __DATE__ and __TIME__ from tracing

Change-Id: I1d54f05f34e8b9c313813619ce14f62e61cb7f9d