tree 11652711271f299feede2c21640985b7ba7b4424
parent 686d9ff53c32ded9b2b02eb9f2040f2030846e51
parent 855a9e6d12e4d42efe336535f9fdf5fc2e14c5d5
author The Android Open Source Project <initial-contribution@android.com> 1273524517 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1273524517 -0700

merge from open-source master

Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c