tree 0d13f5e23ef40a1da3c184e680dee01be7ecaeef
parent 381ee392e8ebba35cb65321415f4cdb537b446ed
parent c3d808a727c2b42d48658e6fca06b1d4a9817f12
author Scott Main <smain@google.com> 1272403692 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272403692 -0700

am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo

Merge commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp

* commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12':
  support a few more header levels for sidebox so the sidebox can