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

* commit '29177deb55d260125771ea554e2df119e6ba6e75':
main
Jean Chalard 2013-05-15 12:50:29 -07:00 committed by Android Git Automerger
commit 2282fcec13

Diff Content Not Available