tree 161887c3609cf9b2ccbed0ecfe068dbff2daf825
parent 88137b334ea55a358860a470da58b0b8989acc3a
author Unsuk Jung <unsuk@google.com> 1443727928 -0700
committer Unsuk Jung <unsuk@google.com> 1443728016 -0700

DO NOT MERGE CTS version is now 6.0_r1

Bug: 21208382
Change-Id: If19708405d706ac974d8199e1ccafc40dd590a78