Android CTS 7.0 Release 6 (3670477)
merge in nyc-release history after reset to nyc-dev
tree: 5bfe6bae33645dc8b54a3c00c8afb21b3ab2d1ad
  1. qcwcn/
  2. Android.mk