tree 2c5cb1e87648fd63b40d16c6c0feb65602c63da7
parent 7d1d98b97e947de22aff4c0b67eec7ae68c822ee
parent 3b43f87d2949a340e2c19cb735af7727157d8274
author The Android Open Source Project <initial-contribution@android.com> 1278095874 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1278095874 -0700

merge from open-source master

Change-Id: I6a15428fd9ce1f1dbbb702ff13c6af8da8f54a1e