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

Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f
This commit is contained in:
The Android Open Source Project 2012-12-21 14:10:50 -08:00
commit f631572908

Diff Content Not Available