tree fdc3ece4f64ff48ddd6f5e49a25e2a5abdf2afde
parent 791e51a5059826e3fb81dfa5b575bcae00a3d29c
author Daniel Xie <dxie@google.com> 1445554185 -0700
committer Daniel Xie <dxie@google.com> 1445554185 -0700

DO NOT MERGE CTS version is now 6.0_r1.5

Change-Id: Ifc77b722ba16368648e952606103d60de1adb611