tree 35de02da65239f89ca82111c6eb08f3e73dfaac4
parent 26dc244f343f286928532a06fec4b91691b36c4e
parent 8d90ef557698d8367c55a56339241a07014a685f
author Tina Zhou <tinazh@google.com> 1479324253 +0000
committer android-build-merger <android-build-merger@google.com> 1479324253 +0000

Merge "Don't include ScreenPinning test on auto" into lollipop-mr1-cts-dev am: 70649a6f9e
am: 8d90ef5576

Change-Id: Ifd9c60909c3a9ce7c5dfad61dcb7a451028cef40