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

* commit 'a18a6fd8cf3796c4316597ac5940b9105aca18d7':
main
Jean Chalard 2013-10-03 14:47:13 -07:00 committed by Android Git Automerger
commit fde684e8db

Diff Content Not Available