tree 271f965991348f5d9ddbf221284483de72277558
parent 5a179fac20488d842643942642f6775fa8918b5b
parent 4c8ddbd9481c7d773634d20be46b0a03f2fcf630
author Dongwon Kang <dwkang@google.com> 1442336441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442336441 +0000

am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev

* commit '4c8ddbd9481c7d773634d20be46b0a03f2fcf630':
  TIF: Ensure the global search can query EPG data