tree dc6b00566431771934a0e1084a316317338b994e
parent 18240489eb8f01134d39c83bff83860cc660a008
parent f9fac43fd390ebd3457ccfbd5e42a11dfb5db236
author The Android Open Source Project <initial-contribution@android.com> 1305927379 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305927397 -0700

Reconcile with honeycomb-mr1-release

Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95