am e1e95fd2: am ea3a2f28: am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"

* commit 'e1e95fd2e48ad639d9df38be565abd9c71007c19':
main
Jean Chalard 2013-10-10 08:22:54 -07:00 committed by Android Git Automerger
commit 3f5dce6280

Diff Content Not Available