merge in nyc-release history after reset to nyc-dev
tree: 1b974155af41382eb101c4939951fdf10aa38c01
  1. qcwcn/
  2. Android.mk