am f431ddcd: am 7b0a1489: Merge "Rename a var to match semantics"

* commit 'f431ddcdb181b973e5e657e65a20f8b18ec5ac4c':
main
Kurt Partridge 2013-09-26 02:28:44 -07:00 committed by Android Git Automerger
commit 58dafb9863

Diff Content Not Available