Reconcile with jb-mr1-release - do not merge

Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
This commit is contained in:
The Android Open Source Project 2012-09-20 10:34:51 -07:00
commit 15eaee40a1

Diff content is not available