tree 05ac4683b7cfe0167c97eecdf829602586c0530b
parent 2567e401e6200fda519ac2ddcf3a411cd2e4c416
parent 8d875546a367c72e30e0366d58382d9a78f77a14
author Etan Cohen <etancohen@google.com> 1488819263 +0000
committer android-build-merger <android-build-merger@google.com> 1488819263 +0000

Merge "[AWARE] VTS baseline" am: 89145d5849
am: 8d875546a3

Change-Id: Ib0629ffee37feb9ed1311a7bcdf31b57a5912791