Reconcile with jb-mr1-release - do not merge

Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107
This commit is contained in:
The Android Open Source Project 2012-11-07 10:20:22 -08:00
commit ba70ed9ae7

Diff content is not available