am bb9842b6: Reconcile with jb-mr2-release - do not merge

* commit 'bb9842b61e188ed70cf9bfb0415f2ba8fb406937':
This commit is contained in:
The Android Open Source Project 2013-04-08 13:40:28 -07:00 committed by Android Git Automerger
commit bc37bf00f8

Diff Content Not Available