tree 12371bae4d12e11ebb385e548c0f9d41bef99e82
parent 86a86930113b3e672b95b061332d814225d0763d
parent cc258c5dc5e0a41dd428f9cf337e2ef7097e9446
author The Android Open Source Project <initial-contribution@android.com> 1307745774 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1307745774 -0700

Reconcile with honeycomb-mr2-release

Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced