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

* commit 'aea4b79de103729df9b7aa7f4975dd6470cde0ac':
This commit is contained in:
Jean-Baptiste Queru 2012-09-28 17:17:31 -07:00 committed by Android Git Automerger
commit 1dc819b37f

Diff Content Not Available