tree 09c402765ff6481ce64b2a2d1af18e09e9eb3f1e
parent 8fd3361eaf411c8c5750318a3fe8f96fb5f3b57d
parent 378f2ef8f26dbdd73b6f051119f75b61ba95d312
author Chris Soyars <ctsoyars@gmail.com> 1278573382 +0000
committer Chris Soyars <ctsoyars@gmail.com> 1278573382 +0000

Merge branch 'froyo' of git@github.com:CyanogenMod/android_vendor_cyanogen into froyo