am 825f29b1: Merge from jb-mr1.1-dev

# Via Jean-Baptiste Queru
* commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':
This commit is contained in:
Jean-Baptiste Queru 2013-02-01 15:41:57 -08:00 committed by Android Git Automerger
commit 024f97c67b

Diff content is not available