Reconcile with jb-mr1.1-release - do not merge

Change-Id: I53296de92b1846263d7aa2dc588d13d3bd7ce930
This commit is contained in:
The Android Open Source Project 2012-12-14 14:03:42 -08:00
commit 1b77050339

Diff content is not available