tree 5b0474fde9db3930e79cf0eba0cdd96f1bcfaf44
parent ec18d35d4f3cf0b6847b26c6d805bc10cd9a77c7
parent 09713d6a1f25cf7e358f96470e1ad5e583cfc01c
author The Android Open Source Project <initial-contribution@android.com> 1308175801 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1308175801 -0700

Reconcile with honeycomb-mr2-release

Change-Id: If4754920ba3d9c25730d0d939235ea779a510369