tree 3bd345750b7153fd14720f5379ac68840832ff62
parent 1a1028467afdc5c0171bd4d9cade62e579316f72
parent a019bea8eb4c0bb0494db47e7388c5401e9bc380
author The Android Open Source Project <initial-contribution@android.com> 1305923076 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305923076 -0700

Reconcile with honeycomb-release

Change-Id: I894d810dbc4d37fe09a2f5e1ae8e9dd7dfbba152