am c1d6374a: (-s ours) am f33c3309: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'c1d6374aed994ac68b010e5118f5256d645192c1':
main
The Android Open Source Project 2012-12-07 07:58:15 -08:00 committed by Android Git Automerger
commit 90561c60b6

Diff Content Not Available