am de1efebd: Merge from jb-mr1-aah-dev

* commit 'de1efebdcac1bfa0e30fa7fbe0b4c7860a72a6a0':
This commit is contained in:
Jean-Baptiste Queru 2012-09-28 15:52:31 -07:00 committed by Android Git Automerger
commit 4dc7206c94

Diff Content Not Available