tree 2f22f4a0631787035ed8c464d9a7c5032877356a
parent 1a264216e0ef530dcfef90fc9a655d483dce74ca
parent f52749d3905352384c3027c5b9b0946ec3e5f490
author Dongwon Kang <dwkang@google.com> 1436572246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436572246 +0000

am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev

* commit 'f52749d3905352384c3027c5b9b0946ec3e5f490':
  TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest