tree d1e8dcb4bd4ce3e9ce67484f13eef5945acb0881
parent 1378630ee468a0aff2d0985c5b59291c3df80615
parent 0f86f86e38de3d18411074ba7a7f476cb7083cd9
author The Android Open Source Project <initial-contribution@android.com> 1305924637 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305924637 -0700

Reconcile with honeycomb-mr1-release

Change-Id: Id7ed4b392060d34981e51f60b5b407b6989737e6