am d9c2de10: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd9c2de10d94b1c46e0e3dee41bd6d8de673d2267':
This commit is contained in:
The Android Open Source Project 2012-08-07 11:04:10 -07:00 committed by Android Git Automerger
commit 60ca41ebb7

Diff Content Not Available