| commit | 4db04227c052aaec075dd89a5483ebc27da47ad9 | [log] [tgz] |
|---|---|---|
| author | Sungsoo Lim <sungsoo@google.com> | Mon Aug 24 15:53:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 15:53:26 2015 +0000 |
| tree | 2efcae23c1208df8a4734d9c559ad18d1a81718d | |
| parent | a3d7eae7f6512458b487a5586e85f68c64b861c5 [diff] | |
| parent | f294ece0300090941a3944c5f74ee6a8de267536 [diff] |
am f294ece0: (-s ours) am 058b3c26: am d50ace98: am 6d6cf8e2: (-s ours) Merge "(DO NOT MERGE) Disable two tests for TV that fail on TV" into lollipop-mr1-cts-dev * commit 'f294ece0300090941a3944c5f74ee6a8de267536': (DO NOT MERGE) Disable two tests for TV that fail on TV