tree 6746d627e4daa8fd87a21311f1a44e9fcaca0236
parent dfe7770a74422d60aae1348eb271b54e158e79f7
parent bb5741e371d31719e25ce108e0172fdc4e19499a
author Suprabh Shukla <suprabh@google.com> 1526940319 -0700
committer android-build-merger <android-build-merger@google.com> 1526940319 -0700

Merge "Skipping test if app standby is not enabled" into pi-dev
am: bb5741e371

Change-Id: I1758de683524871bdad71de50b532b84037139d3