tree bb2405d01a1309efeb523b4aed36d9bc18f9018c
parent ceaebb19e578d6b24db33e471dde59261817affc
parent dce4f0d2445d9ca586287bfb50b58bfee67c1238
author The Android Open Source Project <initial-contribution@android.com> 1305922334 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305922334 -0700

Reconcile with honeycomb-release

Change-Id: I2716b91f5b133ffd4b908227315129a5041fb3c6