am f0229f22: am 2cbc7c68: Merge "Workaround for AIOOB exception in ProximityInfo"

* commit 'f0229f223b51981fe2da05a29d744cc83cf92d80':
This commit is contained in:
Ken Wakasa 2013-09-26 06:03:06 -07:00 committed by Android Git Automerger
commit 4837321c67

Diff content is not available