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