tree 16fc3c0135facf1a0d890fc1fe5e122505be4029
parent d294cac5d83eb18dea9b2f84d4202b13f3ea3c43
parent eabb31b088b0083833eef77cf2e236f8f6124ef0
parent 0c762a978ecd4c6145484bc68627cb8fd9c60209
author The Android Open Source Project <initial-contribution@android.com> 1350312011 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350312011 -0700

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I204c53690f99803900e6613188a6d9a14370e007