tree e2ddb06d0e722b0ef865805bb328ec3a60c3291b
parent 689f12aeb126c2a2da2286bfbcd1e51016de1b0f
parent 0ca152d14204e77872525861a3419e91564a7b6e
author Rebecca Schultz Zavin <rebecca@android.com> 1267205813 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267205813 -0800

Merge "Shift the bridge ioctls around to account for changes necessary for the 32 kernel"