Merge "Set recorded_programs.channel_id as the foreign key of channels._id" into nyc-dev am: e987918
am: c3e523c

* commit 'c3e523c43cb128550f6adf5e9ad0a2d03be0b21a':
  Set recorded_programs.channel_id as the foreign key of channels._id

Change-Id: I7fc5639e574478f80cc68d1ea84dcc9e66f32277
tree: f6211cb090f8fe8378a8435eeeb14bce168242b6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml