tree cdd862826322caeefb9cd21816ef5e9aba4c244c
parent c74dafe038c57550a838c0da056d1242cffdb5e9
parent 32df01f7750b265d78369d34df90e79d21a76504
author The Android Open Source Project <initial-contribution@android.com> 1277144625 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277144625 -0700

merge from froyo-plus-aosp

Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd