tree 5b0474fde9db3930e79cf0eba0cdd96f1bcfaf44
parent a49ca6517003a18d326c1fd97be4b298cd583ed7
parent d1b18426d30645835d08dcfe58bff1f192f4272f
author The Android Open Source Project <initial-contribution@android.com> 1308245576 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1308245576 -0700

Reconcile with honeycomb-mr2-release

Change-Id: Ie64c22de6fee25395210fed13ed0bf2f53fa004f