tree bbae8892c811e3d2c15b2671e5391366302f17af
parent 7c2be0426ef7f39266735389cd765e7aaaf997e8
parent a699d6256fca0336b173c524c5b3d8f7d4fcdc25
author The Android Open Source Project <initial-contribution@android.com> 1271103831 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1271103831 -0700

merge from open-source master

Change-Id: Ife9c7a92ed7abd59b6b3612ba908bcae77055767