tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent c99c7120c34c8cc6715ffe02a66ff500ab2bc508
parent f3998f6abc4e0e1cc502bf82f78298a238c340ba
author The Android Open Source Project <initial-contribution@android.com> 1275494087 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275494087 -0700

merge from open-source master

Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb