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

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

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