Reconcile with jb-mr1-release - do not merge

Change-Id: Ic10126a26c648cbf7402c5e699ec4aea7240fe6e
This commit is contained in:
The Android Open Source Project committed 2012-09-26 09:08:12 -07:00
commit 9fea43e972

Diff Content Not Available