OSDN Git Service

am 734c3632: Merge "Remove COLUMN_CONDITIONAL_ACCESS from TvContract." into lmp-dev
authorDongwon Kang <dwkang@google.com>
Fri, 25 Jul 2014 02:21:44 +0000 (02:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jul 2014 02:21:44 +0000 (02:21 +0000)
* commit '734c3632e26902bef65724ad3a46eaf42209e51a':
  Remove COLUMN_CONDITIONAL_ACCESS from TvContract.


Trivial merge