tree 5afde96efee10d8083aae675c16c846601ee1646
parent 17c058a2ee7bf8b2f2db3bcc9749801fb94e54bd
parent 75b97739efe31d3f2533913b053b125fc7334a0b
author Daniel Xie <dxie@google.com> 1445979965 +0000
committer android-build-merger <android-build-merger@google.com> 1445979965 +0000

Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf  -s ours am: e82a02d553 am: 683ec675df
am: 75b97739ef  -s ours

* commit '75b97739efe31d3f2533913b053b125fc7334a0b':
  DO NOT MERGE: Disable two multi user tests for TV devices