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

* commit 'e4a446d26485d769cc353c52293e7e9829c2a2f8':
main
Jean Chalard 2013-10-03 11:27:14 -07:00 committed by Android Git Automerger
commit a18a6fd8cf

Diff Content Not Available