tree 6c663944ef8d385701c97ef8ebe71394092c845c
parent c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4
parent 0a26aaad8b98c3b80be9562503100e925d078749
author The Android Open Source Project <initial-contribution@android.com> 1273520230 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273520230 -0700

merge from open-source master

Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445