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