tree d2b6dbb107dcf81d71ae99251c93862b125d9f75
parent 22df270e7aba70393d676fd26b0cf8f817a69922
parent 85ac1535718f3dffd80475c7ba6562f37904e3e3
author Jason Monk <jmonk@google.com> 1442530914 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442530914 +0000

am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE

* commit '85ac1535718f3dffd80475c7ba6562f37904e3e3':