tree 38eda9f951b86e5ba035581e719300cb6df94580
parent 88f38d186bcba897ef4222d23515f127c77358aa
parent 3f9d7eaeca27e092302218bac4d1f9aeda59305f
author The Android Open Source Project <initial-contribution@android.com> 1264638128 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264638128 -0800

am 3f9d7eae: merge from open-source master

Merge commit '3f9d7eaeca27e092302218bac4d1f9aeda59305f'

* commit '3f9d7eaeca27e092302218bac4d1f9aeda59305f':
  empty initial commit