tree 2de36888503c3be676ace90f3763543eb2740759
parent 99c0cb2140f75e04c89b0e497a2a91d7300ee042
parent fe0c8f2aaf972cdc24a4bdca25e3d859b8f40d1f
author Daniel Xie <dxie@google.com> 1445979185 +0000
committer android-build-merger <android-build-merger@google.com> 1445979185 +0000

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

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