am e4963260: am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread

Merge commit 'e496326083450e8623268ed794176d980f99eb0c'

* commit 'e496326083450e8623268ed794176d980f99eb0c':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.