tree 5b3eefbfa724f24b5fddbbf1d5ea159c1a6a2aee
parent 21d9fa9e703887295f9c8b8661399ac05800219e
parent 605cd76b4fcf22c67c2105a2de70cad1c5ba7a07
author The Android Open Source Project <initial-contribution@android.com> 1275663345 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275663345 -0700

merge from open-source master

Change-Id: Iaf5b3ca005d424cb8bf14bf38e15fede008fcb47