add 1000Mhz to frequency table
Merge remote-tracking branch 'upstream/jellybean' into jellybean