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

Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9
This commit is contained in:
The Android Open Source Project 2012-12-03 15:58:04 -08:00
commit b1ba5ec9cf

Diff Content Not Available