tree 164db441cae0afe9040f8780ce7e383eafab4188
parent 786b72dfe4d614f751e1a8ed5ead7046c2d2f2c4
parent b5cb7e01572a636b571b514f65304e263059df8d
author Daniel Xie <dxie@google.com> 1445980303 +0000
committer android-build-merger <android-build-merger@google.com> 1445980303 +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
am: b5cb7e0157

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