am 2282fcec: am 29177deb: am 114ec4ac: am 71d52474: Merge "Optimizations and safeguards."

* commit '2282fcec1345f94325ded361bd776d9332173912':
main
Jean Chalard 2013-05-15 12:53:00 -07:00 committed by Android Git Automerger
commit 7d4030b7b2

Diff Content Not Available