Merge "Fix preview channels insertion with null input ID" into oc-dev am: 6b33ebe4bd
am: 8f5ec7a82d

Change-Id: I6883a0df8fcace1d58c3a8901ec74507e5f06c77
tree: 72d7b473ffe888ef72945a66c1144f828c9934a4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml