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

* commit 'adc32bc3b18576a554143631ab72dc14c1b905c3':
This commit is contained in:
Jean-Baptiste Queru 2012-09-28 17:08:41 -07:00 committed by Android Git Automerger
commit eab85a379d

Diff Content Not Available