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