tree 7dea5572f8f95a2fcadc96da59e22beec48e1668
parent ec18364c7b8ef3e05a5c8e25075e1edb5976181c
parent 78b3a8361635ed7dc26e3cc1db05fd233ffec9d1
author Chulwoo Lee <chulwoo@google.com> 1405616730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405616730 +0000

am 3493ee3c: am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev

* commit '3493ee3cc87d35a02ba1b35c3f11572c8511fb66':
  Introduce "input_id" column to the channels table