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

* commit '4837321c671cb361bac5b94635247eb7a238cdeb':
main
Ken Wakasa 2013-09-26 08:10:50 -07:00 committed by Android Git Automerger
commit 98d2d09c78

Diff Content Not Available