Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
This commit is contained in:
The Android Open Source Project 2012-08-16 18:55:59 -07:00
commit dfab95a150

Diff content is not available