Reconcile with jb-mr0-release - do not merge

Change-Id: I5bf193fecac93033d3e224eb75b477f14077b05f
This commit is contained in:
The Android Open Source Project 2012-09-24 07:39:18 -07:00
commit 886784f0a2

Diff content is not available