tree 302899ee2a7e5a14465249ca0bdf4acdbdd5727e
parent c9efe65e74e4609f99b25af445a0cce46ff57a21
parent a2e2cb8e9620c3c926d5a5f22362b9b86ae070f0
author David Ng <dave@codeaurora.org> 1449716058 -0800
committer David Ng <dave@codeaurora.org> 1449716058 -0800
mergetag object a2e2cb8e9620c3c926d5a5f22362b9b86ae070f0
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526285 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBA0ACgkQ6K0/gZqxDngbxACfSYCc8GcNgqZBTN0haYCAoBGh
 mysAnjLYtixGtKdzxG0IBUykfuKG35Ak
 =h2LG
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Update UiAutomator prebuilt with tool type support.

Change-Id: I43246b732c76dcd3bda266f1ce145615ce161692