tree f5e250c8294a948f3bf40c231125fe199e4c5e08
parent cbe053ce2a930384d8c2dc8dc7b150922d986026
parent 113e8569691aa9fab1e19e08d5294ccfdd9f795b
author The Android Open Source Project <initial-contribution@android.com> 1344362556 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1344362556 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc